do not hardcode server ports in unittest, get one dynamically with bind(0)

.dockerignore

@@ -1 +0,0 @@
-build

.gitignore

@@ -1 +0,0 @@
-build

.travis.yml

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

CMakeLists.txt

@@ -10,7 +10,6 @@ set (CMAKE_CXX_STANDARD 14)
 set (CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
-# -Wshorten-64-to-32 does not work with clang
 if (NOT WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
 endif()
@@ -20,7 +19,6 @@ set( IXWEBSOCKET_SOURCES
     ixwebsocket/IXSocket.cpp
     ixwebsocket/IXSocketServer.cpp
     ixwebsocket/IXSocketConnect.cpp
-    ixwebsocket/IXSocketFactory.cpp
     ixwebsocket/IXDNSLookup.cpp
     ixwebsocket/IXCancellationRequest.cpp
     ixwebsocket/IXWebSocket.cpp
@@ -30,9 +28,6 @@ set( IXWEBSOCKET_SOURCES
     ixwebsocket/IXWebSocketPerMessageDeflate.cpp
     ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp
-    ixwebsocket/IXWebSocketHttpHeaders.cpp
-    ixwebsocket/IXHttpClient.cpp
-    ixwebsocket/IXUrlParser.cpp
 )
 
 set( IXWEBSOCKET_HEADERS
@@ -40,11 +35,9 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXSocket.h
     ixwebsocket/IXSocketServer.h
     ixwebsocket/IXSocketConnect.h
-    ixwebsocket/IXSocketFactory.h
     ixwebsocket/IXSetThreadName.h
     ixwebsocket/IXDNSLookup.h
     ixwebsocket/IXCancellationRequest.h
-    ixwebsocket/IXProgressCallback.h
     ixwebsocket/IXWebSocket.h
     ixwebsocket/IXWebSocketServer.h
     ixwebsocket/IXWebSocketTransport.h
@@ -56,8 +49,6 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
     ixwebsocket/IXWebSocketHttpHeaders.h
     ixwebsocket/libwshandshake.hpp
-    ixwebsocket/IXHttpClient.h
-    ixwebsocket/IXUrlParser.h
 )
 
 # Platform specific code
@@ -121,5 +112,3 @@ set( IXWEBSOCKET_INCLUDE_DIRS
     .
     ../../shared/OpenSSL/include)
 target_include_directories( ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS} )
-
-add_subdirectory(ws)

README.md

@@ -5,7 +5,7 @@
 ## Introduction
 
 [*WebSocket*](https://en.wikipedia.org/wiki/WebSocket) is a computer communications protocol, providing full-duplex
-communication channels over a single TCP connection. *IXWebSocket* is a C++ library for client and server Websocket communication, and for client HTTP communication. The code is derived from [easywsclient](https://github.com/dhbaird/easywsclient) and from the [Satori C SDK](https://github.com/satori-com/satori-rtm-sdk-c). It has been tested on the following platforms.
+communication channels over a single TCP connection. *IXWebSocket* is a C++ library for client and server Websocket communication. The code is derived from [easywsclient](https://github.com/dhbaird/easywsclient) and from the [Satori C SDK](https://github.com/satori-com/satori-rtm-sdk-c). It has been tested on the following platforms.
 
 * macOS
 * iOS
@@ -15,7 +15,7 @@ communication channels over a single TCP connection. *IXWebSocket* is a C++ libr
 
 ## Examples
 
-The [*ws*](https://github.com/machinezone/IXWebSocket/tree/master/ws) folder countains many interactive programs for chat, [file transfers](https://github.com/machinezone/IXWebSocket/blob/master/ws/ws_send.cpp), [curl like](https://github.com/machinezone/IXWebSocket/blob/master/ws/ws_http_client.cpp) http clients, demonstrating client and server usage.
+The examples folder countains a simple chat program, using a node.js broadcast server.
 
 Here is what the client API looks like.
 
@@ -25,7 +25,7 @@ ix::WebSocket webSocket;
 std::string url("ws://localhost:8080/");
 webSocket.setUrl(url);
 
-// Optional heart beat, sent every 45 seconds when there is not any traffic
+// Optional heart beat, sent every 45 seconds when there isn't any traffic
 // to make sure that load balancers do not kill an idle connection.
 webSocket.setHeartBeatPeriod(45);
 
@@ -110,68 +110,6 @@ server.wait();
 
 ```
 
-Here is what the HTTP client API looks like. Note that HTTP client support is very recent and subject to changes.
-
-```
-//
-// Preparation
-//
-HttpClient httpClient;
-HttpRequestArgs args;
-
-// Custom headers can be set
-WebSocketHttpHeaders headers;
-headers["Foo"] = "bar";
-args.extraHeaders = parseHeaders(headersData);
-
-// Timeout options
-args.connectTimeout = connectTimeout;
-args.transferTimeout = transferTimeout;
-
-// Redirect options
-args.followRedirects = followRedirects;
-args.maxRedirects = maxRedirects;
-
-// Misc
-args.compress = compress; // Enable gzip compression
-args.verbose = verbose;
-args.logger = [](const std::string& msg)
-{
-    std::cout << msg;
-};
-
-//
-// Request
-//
-HttpResponse out;
-std::string url = "https://www.google.com";
-
-// HEAD request
-out = httpClient.head(url, args);
-
-// GET request
-out = httpClient.get(url, args);
-
-// POST request with parameters
-HttpParameters httpParameters;
-httpParameters["foo"] = "bar";
-out = httpClient.post(url, httpParameters, args);
-
-// POST request with a body
-out = httpClient.post(url, std::string("foo=bar"), args);
-
-//
-// Result
-//
-auto statusCode = std::get<0>(out);
-auto errorCode = std::get<1>(out);
-auto responseHeaders = std::get<2>(out);
-auto payload = std::get<3>(out);
-auto errorMsg = std::get<4>(out);
-auto uploadSize = std::get<5>(out);
-auto downloadSize = std::get<6>(out);
-```
-
 ## Build
 
 CMakefiles for the library and the examples are available. This library has few dependencies, so it is possible to just add the source files into your project.
@@ -196,19 +134,25 @@ No manual polling to fetch data is required. Data is sent and received instantly
 
 If the remote end (server) breaks the connection, the code will try to perpetually reconnect, by using an exponential backoff strategy, capped at one retry every 10 seconds.
 
-### Large messages
-
-Large frames are broken up into smaller chunks or messages to avoid filling up the os tcp buffers, which is permitted thanks to WebSocket [fragmentation](https://tools.ietf.org/html/rfc6455#section-5.4). Messages up to 500M were sent and received succesfully.
-
 ## Limitations
 
 * There is no text support for sending data, only the binary protocol is supported. Sending json or text over the binary protocol works well.
 * Automatic reconnection works at the TCP socket level, and will detect remote end disconnects. However, if the device/computer network become unreachable (by turning off wifi), it is quite hard to reliably and timely detect it at the socket level using `recv` and `send` error codes. [Here](https://stackoverflow.com/questions/14782143/linux-socket-how-to-detect-disconnected-network-in-a-client-program) is a good discussion on the subject. This behavior is consistent with other runtimes such as node.js. One way to detect a disconnected device with low level C code is to do a name resolution with DNS but this can be expensive. Mobile devices have good and reliable API to do that.
-* The server code is using select to detect incoming data, and creates one OS thread per connection. This is not as scalable as strategies using epoll or kqueue.
+* The server code is using select to detect incoming data, and creates one OS thread per connection. This isn't as scalable as strategies using epoll or kqueue.
+
+## Examples
+
+1. Bring up a terminal and jump to the examples folder.
+2. Compile the example C++ code. `sh build.sh`
+3. Install node.js from [here](https://nodejs.org/en/download/).
+4. Type `npm install` to install the node.js dependencies. Then `node broadcast-server.js` to run the server.
+5. Bring up a second terminal. `./cmd_websocket_chat bob`
+6. Bring up a third terminal. `./cmd_websocket_chat bill`
+7. Start typing things in any of those terminals. Hopefully you should see your message being received on the other end.
 
 ## C++ code organization
 
-Here is a simplistic diagram which explains how the code is structured in term of class/modules.
+Here's a simplistic diagram which explains how the code is structured in term of class/modules.
 
 ```
 +-----------------------+ --- Public
@@ -260,7 +204,7 @@ If the connection was closed and sending failed, the return value will be set to
 1. WebSocket_ReadyState_Connecting - The connection is not yet open.
 2. WebSocket_ReadyState_Open       - The connection is open and ready to communicate.
 3. WebSocket_ReadyState_Closing    - The connection is in the process of closing.
-4. WebSocket_MessageType_Close     - The connection is closed or could not be opened.
+4. WebSocket_MessageType_Close     - The connection is closed or couldn't be opened.
 
 ### Open and Close notifications
 
@@ -365,12 +309,11 @@ A ping message can be sent to the server, with an optional data string.
 
 ```
 websocket.ping("ping data, optional (empty string is ok): limited to 125 bytes long");
-```
 
 ### Heartbeat.
 
 You can configure an optional heart beat / keep-alive, sent every 45 seconds
-when there is not any traffic to make sure that load balancers do not kill an
+when there isn't any traffic to make sure that load balancers do not kill an
 idle connection.
 
 ```

docker/Dockerfile.debian

@@ -15,8 +15,5 @@ RUN apt-get -y install cmake
 
 COPY . .
 
-WORKDIR ws
+WORKDIR test
-RUN ["sh", "docker_build.sh"]
+RUN ["sh", "build_linux.sh"]
-
-EXPOSE 8765
-CMD ["/ws/ws", "transfer", "8765"]

examples/broadcast_server/.gitignore

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

examples/broadcast_server/CMakeLists.txt

@@ -0,0 +1,30 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+#
+
+cmake_minimum_required (VERSION 3.4.1)
+project (broadcast_server)
+
+# There's -Weverything too for clang
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
+
+set (OPENSSL_PREFIX /usr/local/opt/openssl) # Homebrew openssl
+
+set (CMAKE_CXX_STANDARD 14)
+
+option(USE_TLS "Add TLS support" ON)
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
+
+include_directories(broadcast_server .)
+
+add_executable(broadcast_server 
+  broadcast_server.cpp)
+
+if (APPLE AND USE_TLS)
+    target_link_libraries(broadcast_server "-framework foundation" "-framework security")
+endif()
+
+target_link_libraries(broadcast_server ixwebsocket)
+install(TARGETS broadcast_server DESTINATION bin)

examples/broadcast_server/broadcast_server.cpp

@@ -0,0 +1,74 @@
+/*
+ *  broadcast_server.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <ixwebsocket/IXWebSocketServer.h>
+
+int main(int argc, char** argv)
+{
+    int port = 8080;
+    if (argc == 2)
+    {
+        std::stringstream ss;
+        ss << argv[1];
+        ss >> port;
+    }
+
+    ix::WebSocketServer server(port);
+
+    server.setOnConnectionCallback(
+        [&server](std::shared_ptr<ix::WebSocket> webSocket)
+        {
+            webSocket->setOnMessageCallback(
+                [webSocket, &server](ix::WebSocketMessageType messageType,
+                   const std::string& str,
+                   size_t wireSize,
+                   const ix::WebSocketErrorInfo& error,
+                   const ix::WebSocketOpenInfo& openInfo,
+                   const ix::WebSocketCloseInfo& closeInfo)
+                {
+                    if (messageType == ix::WebSocket_MessageType_Open)
+                    {
+                        std::cerr << "New connection" << std::endl;
+                        std::cerr << "Uri: " << openInfo.uri << std::endl;
+                        std::cerr << "Headers:" << std::endl;
+                        for (auto it : openInfo.headers)
+                        {
+                            std::cerr << it.first << ": " << it.second << std::endl;
+                        }
+                    }
+                    else if (messageType == ix::WebSocket_MessageType_Close)
+                    {
+                        std::cerr << "Closed connection" << std::endl;
+                    }
+                    else if (messageType == ix::WebSocket_MessageType_Message)
+                    {
+                        for (auto&& client : server.getClients())
+                        {
+                            if (client != webSocket)
+                            {
+                                client->send(str);
+                            }
+                        }
+                    }
+                }
+            );
+        }
+    );
+
+    auto res = server.listen();
+    if (!res.first)
+    {
+        std::cerr << res.second << std::endl;
+        return 1;
+    }
+
+    server.start();
+    server.wait();
+
+    return 0;
+}

examples/chat/.gitignore

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

examples/chat/CMakeLists.txt

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

examples/chat/README.md

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

examples/chat/build_linux.sh

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

examples/chat/build_macos.sh

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

examples/chat/cmd_websocket_chat.cpp

@@ -1,12 +1,12 @@
 /*
- *  ws_chat.cpp
+ *  cmd_websocket_chat.cpp
  *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
  */
 
 //
-// Simple chat program that talks to a broadcast server
+// Simple chat program that talks to the node.js server at
-// Broadcast server can be ran with `ws broadcast_server`
+// websocket_chat_server/broacast-server.js
 //
 
 #include <iostream>
@@ -20,13 +20,19 @@
 // for convenience
 using json = nlohmann::json;
 
-namespace ix
+using namespace ix;
+
+namespace
 {
+    void log(const std::string& msg)
+    {
+        std::cout << msg << std::endl;
+    }
+
     class WebSocketChat
     {
         public:
-            WebSocketChat(const std::string& url,
+            WebSocketChat(const std::string& user);
-                          const std::string& user);
 
             void subscribe(const std::string& channel);
             void start();
@@ -40,27 +46,19 @@ namespace ix
             std::pair<std::string, std::string> decodeMessage(const std::string& str);
 
         private:
-            std::string _url;
             std::string _user;
-            ix::WebSocket _webSocket;
-            std::queue<std::string> _receivedQueue;
 
-            void log(const std::string& msg);
+            ix::WebSocket _webSocket;
+
+            std::queue<std::string> _receivedQueue;
     };
 
-    WebSocketChat::WebSocketChat(const std::string& url,
+    WebSocketChat::WebSocketChat(const std::string& user) :
-                                 const std::string& user) :
-        _url(url),
         _user(user)
     {
         ;
     }
 
-    void WebSocketChat::log(const std::string& msg)
-    {
-        std::cout << msg << std::endl;
-    }
-
     size_t WebSocketChat::getReceivedMessagesCount() const
     {
         return _receivedQueue.size();
@@ -78,10 +76,11 @@ namespace ix
 
     void WebSocketChat::start()
     {
-        _webSocket.setUrl(_url);
+        std::string url("ws://localhost:8080/");
+        _webSocket.setUrl(url);
 
         std::stringstream ss;
-        log(std::string("Connecting to url: ") + _url);
+        log(std::string("Connecting to url: ") + url);
 
         _webSocket.setOnMessageCallback(
             [this](ix::WebSocketMessageType messageType,
@@ -116,7 +115,7 @@ namespace ix
                     // store text
                     _receivedQueue.push(result.second);
 
-                    ss << std::endl
+                    ss << std::endl 
                        << result.first << " > " << result.second
                        << std::endl
                        << _user << " > ";
@@ -165,11 +164,10 @@ namespace ix
         _webSocket.send(encodeMessage(text));
     }
 
-    int ws_chat_main(const std::string& url,
+    void interactiveMain(const std::string& user)
-                     const std::string& user)
     {
         std::cout << "Type Ctrl-D to exit prompt..." << std::endl;
-        WebSocketChat webSocketChat(url, user);
+        WebSocketChat webSocketChat(user);
         webSocketChat.start();
 
         while (true)
@@ -190,3 +188,16 @@ namespace ix
         webSocketChat.stop();
     }
 }
+
+int main(int argc, char** argv)
+{
+    std::string user("user");
+    if (argc == 2)
+    {
+        user = argv[1];
+    }
+
+    Socket::init();
+    interactiveMain(user);
+    return 0;
+}

examples/chat/package-lock.json

@@ -0,0 +1,31 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
+    },
+    "ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "requires": {
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.2",
+        "ultron": "1.1.1"
+      }
+    }
+  }
+}

examples/chat/package.json

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

examples/cobra_publisher/CMakeLists.txt

@@ -15,6 +15,8 @@ set (CMAKE_CXX_STANDARD 14)
 
 option(USE_TLS "Add TLS support" ON)
 
+add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
+
 include_directories(cobra_publisher ${OPENSSL_PREFIX}/include)
 include_directories(cobra_publisher .)
 

examples/cobra_publisher/IXCobraConnection.cpp

@@ -59,8 +59,8 @@ namespace ix
     }
 
     void CobraConnection::invokeEventCallback(ix::CobraConnectionEventType eventType,
-                                              const std::string& errorMsg,
+                                               const std::string& errorMsg,
-                                              const WebSocketHttpHeaders& headers)
+                                               const WebSocketHttpHeaders& headers)
     {
         std::lock_guard<std::mutex> lock(_eventCallbackMutex);
         if (_eventCallback)
@@ -176,10 +176,10 @@ namespace ix
     }
 
     void CobraConnection::configure(const std::string& appkey,
-                                    const std::string& endpoint,
+                                     const std::string& endpoint,
-                                    const std::string& rolename,
+                                     const std::string& rolename,
-                                    const std::string& rolesecret,
+                                     const std::string& rolesecret,
-                                    WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions)
+                                     WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions)
     {
         _appkey = appkey;
         _endpoint = endpoint;
@@ -229,7 +229,7 @@ namespace ix
         return _webSocket.send(serializedJson).success;
     }
 
-    //
+    // 
     // Extract the nonce from the handshake response
     // use it to compute a hash during authentication
     //
@@ -297,7 +297,7 @@ namespace ix
         if (!pdu.isMember("body")) return false;
         Json::Value body = pdu["body"];
 
-        // Identify subscription_id, so that we can find
+        // Identify subscription_id, so that we can find 
         // which callback to execute
         if (!body.isMember("subscription_id")) return false;
         Json::Value subscriptionId = body["subscription_id"];
@@ -339,7 +339,7 @@ namespace ix
     // publish is not thread safe as we are trying to reuse some Json objects.
     //
     bool CobraConnection::publish(const Json::Value& channels,
-                                  const Json::Value& msg)
+                                   const Json::Value& msg)
     {
         _body["channels"] = channels;
         _body["message"] = msg;
@@ -371,7 +371,7 @@ namespace ix
     }
 
     void CobraConnection::subscribe(const std::string& channel,
-                                    SubscriptionCallback cb)
+                                     SubscriptionCallback cb)
     {
         // Create and send a subscribe pdu
         Json::Value body;
@@ -471,5 +471,5 @@ namespace ix
     {
         connect();
     }
-
+    
 } // namespace ix

examples/cobra_publisher/IXCobraConnection.h

@@ -84,7 +84,7 @@ namespace ix
 
         /// Returns true only if we're connected
         bool isConnected() const;
-
+        
         /// Flush the publish queue
         bool flushQueue();
 
@@ -118,7 +118,7 @@ namespace ix
 
         ///
         /// Member variables
-        ///
+        /// 
         WebSocket _webSocket;
 
         /// Configuration data
@@ -148,10 +148,10 @@ namespace ix
         std::unordered_map<std::string, SubscriptionCallback> _cbs;
         mutable std::mutex _cbsMutex;
 
-        // Message Queue can be touched on control+background thread,
+        // Message Queue can be touched on control+background thread, 
         // protecting with a mutex.
         //
-        // Message queue is used when there are problems sending messages so
+        // Message queue is used when there are problems sending messages so 
         // that sending can be retried later.
         std::deque<std::string> _messageQueue;
         mutable std::mutex _queueMutex;
@@ -159,5 +159,5 @@ namespace ix
         // Cap the queue size (100 elems so far -> ~100k)
         static constexpr size_t kQueueMaxSize = 256;
     };
-
+    
 } // namespace ix

examples/cobra_publisher/ixcrypto/IXBase64.cpp

@@ -1,39 +1,39 @@
 /*
  base64.cpp and base64.h
-
+ 
  Copyright (C) 2004-2008 René Nyffenegger
-
+ 
  This source code is provided 'as-is', without any express or implied
  warranty. In no event will the author be held liable for any damages
  arising from the use of this software.
-
+ 
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the following restrictions:
-
+ 
  1. The origin of this source code must not be misrepresented; you must not
  claim that you wrote the original source code. If you use this source code
  in a product, an acknowledgment in the product documentation would be
  appreciated but is not required.
-
+ 
  2. Altered source versions must be plainly marked as such, and must not be
  misrepresented as being the original source code.
-
+ 
  3. This notice may not be removed or altered from any source distribution.
-
+ 
  René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-
+ 
  */
 
 #include "IXBase64.h"
-
+    
 namespace ix
 {
     static const std::string base64_chars =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "abcdefghijklmnopqrstuvwxyz"
     "0123456789+/";
-
+    
     std::string base64_encode(const std::string& data, size_t len)
     {
         std::string ret;
@@ -41,9 +41,9 @@ namespace ix
         int j = 0;
         unsigned char char_array_3[3];
         unsigned char char_array_4[4];
-
+        
         const char* bytes_to_encode = data.c_str();
-
+        
         while(len--)
         {
             char_array_3[i++] = *(bytes_to_encode++);
@@ -53,83 +53,32 @@ namespace ix
                 char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
                 char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
                 char_array_4[3] = char_array_3[2] & 0x3f;
-
+                
                 for(i = 0; (i <4) ; i++)
                     ret += base64_chars[char_array_4[i]];
-
+                
                 i = 0;
             }
         }
-
+        
         if(i)
         {
             for(j = i; j < 3; j++)
                 char_array_3[j] = '\0';
-
+            
             char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
             char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
             char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
             char_array_4[3] = char_array_3[2] & 0x3f;
-
+            
             for(j = 0; (j < i + 1); j++)
                 ret += base64_chars[char_array_4[j]];
-
+            
             while((i++ < 3))
                 ret += '=';
-
+            
         }
-
+        
-        return ret;
-    }
-
-    static inline bool is_base64(unsigned char c)
-    {
-        return (isalnum(c) || (c == '+') || (c == '/'));
-    }
-
-    std::string base64_decode(const std::string& encoded_string)
-    {
-        int in_len = (int)encoded_string.size();
-        int i = 0;
-        int j = 0;
-        int in_ = 0;
-        unsigned char char_array_4[4], char_array_3[3];
-        std::string ret;
-
-        while(in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_]))
-        {
-            char_array_4[i++] = encoded_string[in_]; in_++;
-            if(i ==4)
-            {
-                for(i = 0; i <4; i++)
-                    char_array_4[i] = base64_chars.find(char_array_4[i]);
-
-                char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-                char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-                char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-                for(i = 0; (i < 3); i++)
-                    ret += char_array_3[i];
-
-                i = 0;
-            }
-        }
-
-        if(i)
-        {
-            for(j = i; j <4; j++)
-                char_array_4[j] = 0;
-
-            for(j = 0; j <4; j++)
-                char_array_4[j] = base64_chars.find(char_array_4[j]);
-
-            char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-            char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-            char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-            for(j = 0; (j < i - 1); j++) ret += char_array_3[j];
-        }
-
         return ret;
     }
 }

examples/cobra_publisher/ixcrypto/IXBase64.h

@@ -11,5 +11,4 @@
 namespace ix
 {
     std::string base64_encode(const std::string& data, size_t len);
-    std::string base64_decode(const std::string& encoded_string);
 }

examples/cobra_publisher/ixcrypto/IXHash.cpp

@@ -1,22 +0,0 @@
-/*
- *  IXHash.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone. All rights reserved.
- */
-
-#include <string>
-
-namespace ix
-{
-    uint64_t djb2Hash(const std::string& data)
-    {
-        uint64_t hashAddress = 5381;
-
-        for (auto& c : data)
-        {
-            hashAddress = ((hashAddress << 5) + hashAddress) + c;
-        }
-
-        return hashAddress;
-    }
-}

examples/cobra_publisher/ixcrypto/IXHash.h

@@ -1,15 +0,0 @@
-/*
- *  IXHash.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone. All rights reserved.
- */
-
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-    uint64_t djb2Hash(const std::string& data);
-}
-

examples/cobra_publisher/ixcrypto/IXUuid.cpp

@@ -1,75 +0,0 @@
-/*
- *  IXUuid.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone. All rights reserved.
- */
-
-/**
- * Generate a random uuid similar to the uuid python module
- *
- * >>> import uuid
- * >>> uuid.uuid4().hex
- * 'bec08155b37d4050a1f3c3fa0276bf12'
- *
- * Code adapted from https://github.com/r-lyeh-archived/sole
- */
-
-#include "IXUuid.h"
-
-#include <sstream>
-#include <string>
-#include <iomanip>
-#include <random>
-
-
-namespace ix
-{
-    class Uuid
-    {
-        public:
-            Uuid();
-            std::string toString() const;
-
-        private:
-            uint64_t _ab;
-            uint64_t _cd;
-    };
-
-    Uuid::Uuid()
-    {
-        static std::random_device rd;
-        static std::uniform_int_distribution<uint64_t> dist(0, (uint64_t)(~0));
-
-        _ab = dist(rd);
-        _cd = dist(rd);
-
-        _ab = (_ab & 0xFFFFFFFFFFFF0FFFULL) | 0x0000000000004000ULL;
-        _cd = (_cd & 0x3FFFFFFFFFFFFFFFULL) | 0x8000000000000000ULL;
-    }
-
-    std::string Uuid::toString() const
-    {
-        std::stringstream ss;
-        ss << std::hex << std::nouppercase << std::setfill('0');
-
-        uint32_t a = (_ab >> 32);
-        uint32_t b = (_ab & 0xFFFFFFFF);
-        uint32_t c = (_cd >> 32);
-        uint32_t d = (_cd & 0xFFFFFFFF);
-
-        ss << std::setw(8) << (a);
-        ss << std::setw(4) << (b >> 16);
-        ss << std::setw(4) << (b & 0xFFFF);
-        ss << std::setw(4) << (c >> 16 );
-        ss << std::setw(4) << (c & 0xFFFF);
-        ss << std::setw(8) << d;
-
-        return ss.str();
-    }
-
-    std::string uuid4()
-    {
-        Uuid id;
-        return id.toString();
-    }
-}

examples/cobra_publisher/ixcrypto/IXUuid.h

@@ -1,17 +0,0 @@
-/*
- *  IXUuid.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017 Machine Zone. All rights reserved.
- */
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-   /**
-    * Generate a random uuid
-    */
-   std::string uuid4();
-
-}

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

@@ -7,28 +7,28 @@
 // //////////////////////////////////////////////////////////////////////
 
 /*
-The JsonCpp library's source code, including accompanying documentation,
+The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...
 
-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
+jurisdictions which recognize such a disclaimer. In such jurisdictions, 
 this software is released into the Public Domain.
 
 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).
 
-In jurisdictions which recognize Public Domain property, the user of this
+In jurisdictions which recognize Public Domain property, the user of this 
-software may choose to accept it either as 1) Public Domain, 2) under the
+software may choose to accept it either as 1) Public Domain, 2) under the 
-conditions of the MIT License (see below), or 3) under the terms of dual
+conditions of the MIT License (see below), or 3) under the terms of dual 
 Public Domain/MIT License conditions described here, as they choose.
 
 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:
 
    http://en.wikipedia.org/wiki/MIT_License
-
+   
 The full text of the MIT License follows:
 
 ========================================================================

examples/cobra_publisher/jsoncpp/json/json.h

@@ -6,28 +6,28 @@
 // //////////////////////////////////////////////////////////////////////
 
 /*
-The JsonCpp library's source code, including accompanying documentation,
+The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...
 
-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
+jurisdictions which recognize such a disclaimer. In such jurisdictions, 
 this software is released into the Public Domain.
 
 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).
 
-In jurisdictions which recognize Public Domain property, the user of this
+In jurisdictions which recognize Public Domain property, the user of this 
-software may choose to accept it either as 1) Public Domain, 2) under the
+software may choose to accept it either as 1) Public Domain, 2) under the 
-conditions of the MIT License (see below), or 3) under the terms of dual
+conditions of the MIT License (see below), or 3) under the terms of dual 
 Public Domain/MIT License conditions described here, as they choose.
 
 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:
 
    http://en.wikipedia.org/wiki/MIT_License
-
+   
 The full text of the MIT License follows:
 
 ========================================================================
@@ -1673,7 +1673,7 @@ public:
     - `"rejectDupKeys": false or true`
       - If true, `parse()` returns false when a key is duplicated within an object.
     - `"allowSpecialFloats": false or true`
-      - If true, special float values (NaNs and infinities) are allowed
+      - If true, special float values (NaNs and infinities) are allowed 
         and their values are lossfree restorable.
 
     You can examine 'settings_` yourself

examples/cobra_publisher/jsoncpp/jsoncpp.cpp

@@ -6,28 +6,28 @@
 // //////////////////////////////////////////////////////////////////////
 
 /*
-The JsonCpp library's source code, including accompanying documentation,
+The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...
 
-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
+jurisdictions which recognize such a disclaimer. In such jurisdictions, 
 this software is released into the Public Domain.
 
 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).
 
-In jurisdictions which recognize Public Domain property, the user of this
+In jurisdictions which recognize Public Domain property, the user of this 
-software may choose to accept it either as 1) Public Domain, 2) under the
+software may choose to accept it either as 1) Public Domain, 2) under the 
-conditions of the MIT License (see below), or 3) under the terms of dual
+conditions of the MIT License (see below), or 3) under the terms of dual 
 Public Domain/MIT License conditions described here, as they choose.
 
 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:
 
    http://en.wikipedia.org/wiki/MIT_License
-
+   
 The full text of the MIT License follows:
 
 ========================================================================
@@ -238,7 +238,7 @@ static inline void fixNumericLocaleInput(char* begin, char* end) {
 #include <limits>
 
 #if defined(_MSC_VER)
-#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
+#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above 
 #define snprintf sprintf_s
 #elif _MSC_VER >= 1900 // VC++ 14.0 and above
 #define snprintf std::snprintf
@@ -383,7 +383,7 @@ bool Reader::parse(const char* beginDoc,
 
 bool Reader::readValue() {
   // readValue() may call itself only if it calls readObject() or ReadArray().
-  // These methods execute nodes_.push() just before and nodes_.pop)() just after calling readValue().
+  // These methods execute nodes_.push() just before and nodes_.pop)() just after calling readValue(). 
   // parse() executes one nodes_.push(), so > instead of >=.
   if (nodes_.size() > stackLimit_g) throwRuntimeError("Exceeded stackLimit in readValue().");
 
@@ -4215,7 +4215,7 @@ Value& Path::make(Value& root) const {
 #endif
 #endif
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__)  
 #include <float.h>
 #define isfinite _finite
 #define snprintf _snprintf
@@ -5290,7 +5290,7 @@ StreamWriter* StreamWriterBuilder::newStreamWriter() const
   JSONCPP_STRING cs_str = settings_["commentStyle"].asString();
   bool eyc = settings_["enableYAMLCompatibility"].asBool();
   bool dnp = settings_["dropNullPlaceholders"].asBool();
-  bool usf = settings_["useSpecialFloats"].asBool();
+  bool usf = settings_["useSpecialFloats"].asBool(); 
   unsigned int pre = settings_["precision"].asUInt();
   CommentStyle::Enum cs = CommentStyle::All;
   if (cs_str == "All") {

examples/echo_server/CMakeLists.txt

@@ -0,0 +1,30 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+#
+
+cmake_minimum_required (VERSION 3.4.1)
+project (echo_server)
+
+# There's -Weverything too for clang
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
+
+set (OPENSSL_PREFIX /usr/local/opt/openssl) # Homebrew openssl
+
+set (CMAKE_CXX_STANDARD 14)
+
+option(USE_TLS "Add TLS support" ON)
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
+
+include_directories(echo_server .)
+
+add_executable(echo_server 
+  echo_server.cpp)
+
+if (APPLE AND USE_TLS)
+    target_link_libraries(echo_server "-framework foundation" "-framework security")
+endif()
+
+target_link_libraries(echo_server ixwebsocket)
+install(TARGETS echo_server DESTINATION bin)

examples/echo_server/echo_server.cpp

@@ -0,0 +1,68 @@
+/*
+ *  echo_server.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <ixwebsocket/IXWebSocketServer.h>
+
+int main(int argc, char** argv)
+{
+    int port = 8080;
+    if (argc == 2)
+    {
+        std::stringstream ss;
+        ss << argv[1];
+        ss >> port;
+    }
+
+    ix::WebSocketServer server(port);
+
+    server.setOnConnectionCallback(
+        [&server](std::shared_ptr<ix::WebSocket> webSocket)
+        {
+            webSocket->setOnMessageCallback(
+                [webSocket, &server](ix::WebSocketMessageType messageType,
+                   const std::string& str,
+                   size_t wireSize,
+                   const ix::WebSocketErrorInfo& error,
+                   const ix::WebSocketOpenInfo& openInfo,
+                   const ix::WebSocketCloseInfo& closeInfo)
+                {
+                    if (messageType == ix::WebSocket_MessageType_Open)
+                    {
+                        std::cerr << "New connection" << std::endl;
+                        std::cerr << "Uri: " << openInfo.uri << std::endl;
+                        std::cerr << "Headers:" << std::endl;
+                        for (auto it : openInfo.headers)
+                        {
+                            std::cerr << it.first << ": " << it.second << std::endl;
+                        }
+                    }
+                    else if (messageType == ix::WebSocket_MessageType_Close)
+                    {
+                        std::cerr << "Closed connection" << std::endl;
+                    }
+                    else if (messageType == ix::WebSocket_MessageType_Message)
+                    {
+                        webSocket->send(str);
+                    }
+                }
+            );
+        }
+    );
+
+    auto res = server.listen();
+    if (!res.first)
+    {
+        std::cerr << res.second << std::endl;
+        return 1;
+    }
+
+    server.start();
+    server.wait();
+
+    return 0;
+}

examples/ping_pong/.gitignore

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

examples/ping_pong/CMakeLists.txt

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

examples/ping_pong/build_linux.sh

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

examples/ping_pong/client.py

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

examples/ping_pong/ping_pong.cpp

@@ -1,7 +1,7 @@
 /*
- *  ws_ping_pong.cpp
+ *  ping_pong.cpp
  *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
  */
 
 #include <iostream>
@@ -9,8 +9,15 @@
 #include <ixwebsocket/IXWebSocket.h>
 #include <ixwebsocket/IXSocket.h>
 
-namespace ix
+using namespace ix;
+
+namespace
 {
+    void log(const std::string& msg)
+    {
+        std::cout << msg << std::endl;
+    }
+
     class WebSocketPingPong
     {
         public:
@@ -26,8 +33,6 @@ namespace ix
         private:
             std::string _url;
             ix::WebSocket _webSocket;
-
-            void log(const std::string& msg);
     };
 
     WebSocketPingPong::WebSocketPingPong(const std::string& url) :
@@ -36,11 +41,6 @@ namespace ix
         ;
     }
 
-    void WebSocketPingPong::log(const std::string& msg)
-    {
-        std::cout << msg << std::endl;
-    }
-
     void WebSocketPingPong::stop()
     {
         _webSocket.stop();
@@ -124,7 +124,7 @@ namespace ix
         _webSocket.send(text);
     }
 
-    int ws_ping_pong_main(const std::string& url)
+    void interactiveMain(const std::string& url)
     {
         std::cout << "Type Ctrl-D to exit prompt..." << std::endl;
         WebSocketPingPong webSocketPingPong(url);
@@ -155,3 +155,17 @@ namespace ix
         webSocketPingPong.stop();
     }
 }
+
+int main(int argc, char** argv)
+{
+    if (argc != 2)
+    {
+        std::cerr << "Usage: ping_pong <url>" << std::endl;
+        return 1;
+    }
+    std::string url = argv[1];
+
+    Socket::init();
+    interactiveMain(url);
+    return 0;
+}

examples/ping_pong/server.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import os
+import asyncio
+import websockets
+
+async def echo(websocket, path):
+    async for message in websocket:
+        print(message)
+        await websocket.send(message)
+
+        if os.getenv('TEST_CLOSE'):
+            print('Closing')
+            # breakpoint()
+            await websocket.close(1001, 'close message')
+            # await websocket.close()
+            break
+
+asyncio.get_event_loop().run_until_complete(
+    websockets.serve(echo, 'localhost', 5678))
+asyncio.get_event_loop().run_forever()

examples/ping_pong/test.sh

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

examples/ws_connect/.gitignore

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

examples/ws_connect/CMakeLists.txt

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

examples/ws_connect/README.md

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

examples/ws_connect/build_linux.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+#
+
+# 'manual' way of building. You can also use cmake.
+
+g++ --std=c++11 \
+    -DIXWEBSOCKET_USE_TLS \
+    -g \
+    ../../ixwebsocket/IXEventFd.cpp	\
+    ../../ixwebsocket/IXSocket.cpp	\
+    ../../ixwebsocket/IXSetThreadName.cpp	\
+    ../../ixwebsocket/IXWebSocketTransport.cpp \
+    ../../ixwebsocket/IXWebSocket.cpp \
+    ../../ixwebsocket/IXDNSLookup.cpp \
+    ../../ixwebsocket/IXSocketConnect.cpp \
+    ../../ixwebsocket/IXSocketOpenSSL.cpp \
+    ../../ixwebsocket/IXWebSocketPerMessageDeflate.cpp \
+    ../../ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp \
+    -I ../.. \
+    ws_connect.cpp \
+    -o ws_connect \
+    -lcrypto -lssl -lz -lpthread

examples/ws_connect/ws_connect.cpp

@@ -9,8 +9,15 @@
 #include <ixwebsocket/IXWebSocket.h>
 #include <ixwebsocket/IXSocket.h>
 
-namespace ix
+using namespace ix;
+
+namespace
 {
+    void log(const std::string& msg)
+    {
+        std::cout << msg << std::endl;
+    }
+
     class WebSocketConnect
     {
         public:
@@ -25,8 +32,6 @@ namespace ix
         private:
             std::string _url;
             ix::WebSocket _webSocket;
-
-            void log(const std::string& msg);
     };
 
     WebSocketConnect::WebSocketConnect(const std::string& url) :
@@ -35,11 +40,6 @@ namespace ix
         ;
     }
 
-    void WebSocketConnect::log(const std::string& msg)
-    {
-        std::cout << msg << std::endl;
-    }
-
     void WebSocketConnect::stop()
     {
         _webSocket.stop();
@@ -148,12 +148,18 @@ namespace ix
         std::cout << std::endl;
         webSocketChat.stop();
     }
-
-    int ws_connect_main(const std::string& url)
-    {
-        Socket::init();
-        interactiveMain(url);
-        return 0;
-    }
 }
 
+int main(int argc, char** argv)
+{
+    if (argc != 2)
+    {
+        std::cerr << "Usage: ws_connect <url>" << std::endl;
+        return 1;
+    }
+    std::string url = argv[1];
+
+    Socket::init();
+    interactiveMain(url);
+    return 0;
+}

examples/ws_receive/.gitignore

@@ -1 +0,0 @@
-build

examples/ws_receive/CMakeLists.txt

@@ -1,30 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-cmake_minimum_required (VERSION 3.4.1)
-project (ws_receive)
-
-# There's -Weverything too for clang
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
-
-set (CMAKE_CXX_STANDARD 14)
-
-option(USE_TLS "Add TLS support" ON)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
-
-include_directories(ws_receive .)
-
-add_executable(ws_receive 
-  jsoncpp/jsoncpp.cpp
-  ixcrypto/IXBase64.cpp
-  ixcrypto/IXHash.cpp
-  ws_receive.cpp)
-
-if (APPLE AND USE_TLS)
-    target_link_libraries(ws_receive "-framework foundation" "-framework security")
-endif()
-
-target_link_libraries(ws_receive ixwebsocket)

examples/ws_receive/README.md

@@ -1 +0,0 @@
-ws_receive is a simple server upload program. It needs to be used in conjonction with ws_send.

examples/ws_receive/ixcrypto

@@ -1 +0,0 @@
-../cobra_publisher/ixcrypto

examples/ws_receive/package-lock.json

@@ -1,29 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
-    },
-    "base-64": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
-      "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
-    },
-    "djb2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/djb2/-/djb2-0.0.2.tgz",
-      "integrity": "sha1-RAs4kao6uBQrVNRpsXe66p6W5O8="
-    },
-    "ws": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
-      "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
-      "requires": {
-        "async-limiter": "1.0.0"
-      }
-    }
-  }
-}

examples/ws_receive/ws_receive.cpp

@@ -1,153 +0,0 @@
-/*
- *  ws_receive.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <ixwebsocket/IXWebSocketServer.h>
-#include <jsoncpp/json/json.h>
-#include <ixcrypto/IXBase64.h>
-#include <ixcrypto/IXHash.h>
-
-
-namespace
-{
-    // We should cleanup the file name and full path further to remove .. as well
-    std::string extractFilename(const std::string& path)
-    {
-        std::string filename("filename.conf");
-        std::string::size_type idx;
-
-        idx = path.rfind('/');
-        if (idx != std::string::npos)
-        {
-            std::string filename = path.substr(idx+1);
-            return filename;
-        }
-        else
-        {
-            return std::string();
-        }
-    }
-}
-
-namespace ix
-{
-    void errorHandler(const std::string& errMsg,
-                      const std::string& id,
-                      std::shared_ptr<ix::WebSocket> webSocket)
-    {
-        Json::Value pdu;
-        pdu["kind"] = "error";
-        pdu["id"] = id;
-        pdu["message"] = errMsg;
-        webSocket->send(pdu.toStyledString());
-    }
-
-    void messageHandler(const std::string& str,
-                        std::shared_ptr<ix::WebSocket> webSocket)
-    {
-        std::cerr << "Received message: " << str.size() << std::endl;
-
-        Json::Value data;
-        Json::Reader reader;
-        if (!reader.parse(str, data))
-        {
-            errorHandler("Invalid JSON", std::string(), webSocket);
-            return;
-        }
-
-        std::cout << "id: " << data["id"].asString() << std::endl;
-
-        std::string content = ix::base64_decode(data["content"].asString());
-        std::cout << "Content size: " << content.size() << std::endl;
-
-        // Validate checksum
-        uint64_t cksum = ix::djb2Hash(data["content"].asString());
-        uint64_t cksumRef = data["djb2_hash"].asUInt64();
-
-        std::cout << "Computed hash: " << cksum << std::endl;
-        std::cout << "Reference hash: " << cksumRef << std::endl;
-
-        if (cksum != cksumRef)
-        {
-            errorHandler("Hash mismatch.", std::string(), webSocket);
-            return;
-        }
-
-        std::string filename = data["filename"].asString();
-        filename = extractFilename(filename);
-
-        std::ofstream out(filename);
-        out << content;
-        out.close();
-
-        Json::Value pdu;
-        pdu["ack"] = true;
-        pdu["id"] = data["id"];
-        pdu["filename"] = data["filename"];
-        webSocket->send(pdu.toStyledString());
-    }
-}
-
-int main(int argc, char** argv)
-{
-    int port = 8080;
-    if (argc == 2)
-    {
-        std::stringstream ss;
-        ss << argv[1];
-        ss >> port;
-    }
-
-    ix::WebSocketServer server(port);
-
-    server.setOnConnectionCallback(
-        [&server](std::shared_ptr<ix::WebSocket> webSocket)
-        {
-            webSocket->setOnMessageCallback(
-                [webSocket, &server](ix::WebSocketMessageType messageType,
-                                     const std::string& str,
-                                     size_t wireSize,
-                                     const ix::WebSocketErrorInfo& error,
-                                     const ix::WebSocketOpenInfo& openInfo,
-                                     const ix::WebSocketCloseInfo& closeInfo)
-                {
-                    if (messageType == ix::WebSocket_MessageType_Open)
-                    {
-                        std::cerr << "New connection" << std::endl;
-                        std::cerr << "Uri: " << openInfo.uri << std::endl;
-                        std::cerr << "Headers:" << std::endl;
-                        for (auto it : openInfo.headers)
-                        {
-                            std::cerr << it.first << ": " << it.second << std::endl;
-                        }
-                    }
-                    else if (messageType == ix::WebSocket_MessageType_Close)
-                    {
-                        std::cerr << "Closed connection" << std::endl;
-                    }
-                    else if (messageType == ix::WebSocket_MessageType_Message)
-                    {
-                        messageHandler(str, webSocket);
-                    }
-                }
-            );
-        }
-    );
-
-    auto res = server.listen();
-    if (!res.first)
-    {
-        std::cerr << res.second << std::endl;
-        return 1;
-    }
-
-    server.start();
-    server.wait();
-
-    return 0;
-}

examples/ws_receive/ws_receive.js

@@ -1,43 +0,0 @@
-/*
- *  ws_receive.js
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-const WebSocket = require('ws')
-const djb2 = require('djb2')
-const fs = require('fs')
-
-const wss = new WebSocket.Server({ port: 8080,
-                                   perMessageDeflate: false,
-                                   maxPayload: 1024 * 1024 * 1024 * 1024});
-
-wss.on('connection', function connection(ws) {
-  ws.on('message', function incoming(data) {
-    console.log('Received message')
-
-    let str = data.toString()
-    let obj = JSON.parse(str)
-
-    console.log(obj.id)
-    console.log(obj.djb2_hash)
-    console.log(djb2(obj.content))
-
-    var content = Buffer.from(obj.content, 'base64')
-    // let bytes = base64.decode(obj.content)
-
-    let path = obj.filename
-    fs.writeFile(path, content, function(err) {
-      if (err) {
-        throw err
-      } else {
-        console.log('wrote data to disk')
-      }
-    });
-
-    let response = {
-      id: obj.id
-    }
-
-    ws.send(JSON.stringify(response))
-  });
-});

examples/ws_send/.gitignore

@@ -1 +0,0 @@
-build

examples/ws_send/CMakeLists.txt

@@ -1,31 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-cmake_minimum_required (VERSION 3.4.1)
-project (ws_send)
-
-# There's -Weverything too for clang
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
-
-set (CMAKE_CXX_STANDARD 14)
-
-option(USE_TLS "Add TLS support" ON)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
-
-include_directories(ws_send .)
-
-add_executable(ws_send 
-  jsoncpp/jsoncpp.cpp
-  ixcrypto/IXBase64.cpp
-  ixcrypto/IXUuid.cpp
-  ixcrypto/IXHash.cpp
-  ws_send.cpp)
-
-if (APPLE AND USE_TLS)
-    target_link_libraries(ws_send "-framework foundation" "-framework security")
-endif()
-
-target_link_libraries(ws_send ixwebsocket)

examples/ws_send/README.md

@@ -1 +0,0 @@
-ws_send is a simple upload program. It needs to be used in conjonction with ws_receive.

examples/ws_send/ixcrypto

@@ -1 +0,0 @@
-../cobra_publisher/ixcrypto

examples/ws_send/jsoncpp

@@ -1 +0,0 @@
-../cobra_publisher/jsoncpp

examples/ws_send/ws_send.cpp

@@ -1,306 +0,0 @@
-/*
- *  ws_send.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <condition_variable>
-#include <mutex>
-#include <chrono>
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXSocket.h>
-#include <ixcrypto/IXUuid.h>
-#include <ixcrypto/IXBase64.h>
-#include <ixcrypto/IXHash.h>
-#include <jsoncpp/json/json.h>
-
-using namespace ix;
-
-namespace
-{
-    void log(const std::string& msg)
-    {
-        std::cout << msg << std::endl;
-    }
-
-    class WebSocketSender
-    {
-        public:
-            WebSocketSender(const std::string& _url,
-                            bool enablePerMessageDeflate);
-
-            void subscribe(const std::string& channel);
-            void start();
-            void stop();
-
-            void waitForConnection();
-            void waitForAck();
-
-            void sendMessage(const std::string& filename, bool throttle);
-
-        private:
-            std::string _url;
-            std::string _id;
-            ix::WebSocket _webSocket;
-            bool _enablePerMessageDeflate;
-
-            std::mutex _conditionVariableMutex;
-            std::condition_variable _condition;
-    };
-
-    WebSocketSender::WebSocketSender(const std::string& url,
-                                     bool enablePerMessageDeflate) :
-        _url(url),
-        _enablePerMessageDeflate(enablePerMessageDeflate)
-    {
-        ;
-    }
-
-    void WebSocketSender::stop()
-    {
-        _webSocket.stop();
-    }
-
-    void WebSocketSender::waitForConnection()
-    {
-        std::cout << "Connecting..." << std::endl;
-
-        std::unique_lock<std::mutex> lock(_conditionVariableMutex);
-        _condition.wait(lock);
-    }
-
-    void WebSocketSender::waitForAck()
-    {
-        std::cout << "Waiting for ack..." << std::endl;
-
-        std::unique_lock<std::mutex> lock(_conditionVariableMutex);
-        _condition.wait(lock);
-    }
-
-    std::string load(const std::string& path)
-    {
-        // std::vector<uint8_t> memblock;
-        std::string str;
-
-        std::ifstream file(path);
-        if (!file.is_open()) return std::string();
-
-        file.seekg(0, file.end);
-        std::streamoff size = file.tellg();
-        file.seekg(0, file.beg);
-
-        str.resize(size);
-        file.read((char*)&str.front(), static_cast<std::streamsize>(size));
-
-        return str;
-    }
-
-    void WebSocketSender::start()
-    {
-        _webSocket.setUrl(_url);
-
-        ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(
-            _enablePerMessageDeflate, false, false, 15, 15);
-        _webSocket.setPerMessageDeflateOptions(webSocketPerMessageDeflateOptions);
-
-        std::stringstream ss;
-        log(std::string("Connecting to url: ") + _url);
-
-        _webSocket.setOnMessageCallback(
-            [this](ix::WebSocketMessageType messageType,
-               const std::string& str,
-               size_t wireSize,
-               const ix::WebSocketErrorInfo& error,
-               const ix::WebSocketOpenInfo& openInfo,
-               const ix::WebSocketCloseInfo& closeInfo)
-            {
-                std::stringstream ss;
-                if (messageType == ix::WebSocket_MessageType_Open)
-                {
-                    _condition.notify_one();
-
-                    log("ws_send: connected");
-                    std::cout << "Uri: " << openInfo.uri << std::endl;
-                    std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : openInfo.headers)
-                    {
-                        std::cout << it.first << ": " << it.second << std::endl;
-                    }
-                }
-                else if (messageType == ix::WebSocket_MessageType_Close)
-                {
-                    ss << "ws_send: connection closed:";
-                    ss << " code " << closeInfo.code;
-                    ss << " reason " << closeInfo.reason << std::endl;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocket_MessageType_Message)
-                {
-                    _condition.notify_one();
-
-                    ss << "ws_send: received message: "
-                       << str;
-                    log(ss.str());
-
-                    Json::Value data;
-                    Json::Reader reader;
-                    if (!reader.parse(str, data))
-                    {
-                        std::cerr << "Invalid JSON response" << std::endl;
-                        return;
-                    }
-
-                    std::string id = data["id"].asString();
-                    if (_id != id)
-                    {
-                        std::cerr << "Invalid id" << std::endl;
-                    }
-                }
-                else if (messageType == ix::WebSocket_MessageType_Error)
-                {
-                    ss << "Connection error: " << error.reason      << std::endl;
-                    ss << "#retries: "         << error.retries     << std::endl;
-                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << error.http_status << std::endl;
-                    log(ss.str());
-                }
-                else
-                {
-                    ss << "Invalid ix::WebSocketMessageType";
-                    log(ss.str());
-                }
-            });
-
-        _webSocket.start();
-    }
-
-    class Bench
-    {
-        public:
-            Bench(const std::string& description) :
-                _description(description),
-                _start(std::chrono::system_clock::now()),
-                _reported(false)
-            {
-                ;
-            }
-
-            ~Bench()
-            {
-                if (!_reported)
-                {
-                    report();
-                }
-            }
-
-            void report()
-            {
-                auto now = std::chrono::system_clock::now();
-                auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(now - _start);
-
-                _ms = milliseconds.count();
-                std::cout << _description << " completed in "
-                          << _ms << "ms" << std::endl;
-
-                _reported = true;
-            }
-
-            uint64_t getDuration() const
-            {
-                return _ms;
-            }
-
-        private:
-            std::string _description;
-            std::chrono::time_point<std::chrono::system_clock> _start;
-            uint64_t _ms;
-            bool _reported;
-    };
-
-    void WebSocketSender::sendMessage(const std::string& filename,
-                                      bool throttle)
-    {
-        std::string content;
-        {
-            Bench bench("load file from disk");
-            content = load(filename);
-        }
-
-        _id = uuid4();
-
-        std::string b64Content;
-        {
-            Bench bench("base 64 encode file");
-            b64Content = base64_encode(content, content.size());
-        }
-
-        Json::Value pdu;
-        pdu["kind"] = "send";
-        pdu["id"] = _id;
-        pdu["content"] = b64Content;
-        pdu["djb2_hash"] = djb2Hash(b64Content);
-        pdu["filename"] = filename;
-
-        Bench bench("Sending file through websocket");
-        _webSocket.send(pdu.toStyledString(),
-                        [throttle](int current, int total) -> bool
-        {
-            std::cout << "Step " << current << " out of " << total << std::endl;
-
-            if (throttle)
-            {
-                std::chrono::duration<double, std::milli> duration(10);
-                std::this_thread::sleep_for(duration);
-            }
-
-            return true;
-        });
-
-        bench.report();
-        auto duration = bench.getDuration();
-        auto transferRate = 1000 * b64Content.size() / duration;
-        transferRate /= (1024 * 1024);
-        std::cout << "Send transfer rate: " << transferRate << "MB/s" << std::endl;
-    }
-
-    void wsSend(const std::string& url,
-                const std::string& path,
-                bool enablePerMessageDeflate,
-                bool throttle)
-    {
-        WebSocketSender webSocketSender(url, enablePerMessageDeflate);
-        webSocketSender.start();
-
-        webSocketSender.waitForConnection();
-
-        std::cout << "Sending..." << std::endl;
-        webSocketSender.sendMessage(path, throttle);
-
-        webSocketSender.waitForAck();
-
-        std::cout << "Done !" << std::endl;
-        webSocketSender.stop();
-    }
-}
-
-int main(int argc, char** argv)
-{
-    if (argc != 3)
-    {
-        std::cerr << "Usage: ws_send <url> <path>" << std::endl;
-        return 1;
-    }
-    std::string url = argv[1];
-    std::string path = argv[2];
-
-    bool throttle = false;
-    bool enablePerMessageDeflate = false;
-
-    Socket::init();
-    wsSend(url, path, enablePerMessageDeflate, throttle);
-    return 0;
-}

ixwebsocket/IXCancellationRequest.cpp

@@ -8,7 +8,7 @@
 
 #include <chrono>
 
-namespace ix
+namespace ix 
 {
     CancellationRequest makeCancellationRequestWithTimeout(int secs,
                                                            std::atomic<bool>& requestInitCancellation)
@@ -20,7 +20,7 @@ namespace ix
         {
             // Was an explicit cancellation requested ?
             if (requestInitCancellation) return true;
-
+            
             auto now = std::chrono::system_clock::now();
             if ((now - start) > timeout) return true;
 

ixwebsocket/IXCancellationRequest.h

@@ -9,7 +9,7 @@
 #include <functional>
 #include <atomic>
 
-namespace ix
+namespace ix 
 {
     using CancellationRequest = std::function<bool()>;
 

ixwebsocket/IXDNSLookup.cpp

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <chrono>
 
-namespace ix
+namespace ix 
 {
     const int64_t DNSLookup::kDefaultWait = 10; // ms
 
@@ -26,7 +26,7 @@ namespace ix
         _done(false),
         _id(_nextId++)
     {
-
+        
     }
 
     DNSLookup::~DNSLookup()
@@ -36,7 +36,7 @@ namespace ix
         _activeJobs.erase(_id);
     }
 
-    struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname,
+    struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname, 
                                             int port,
                                             std::string& errMsg)
     {
@@ -49,7 +49,7 @@ namespace ix
         std::string sport = std::to_string(port);
 
         struct addrinfo* res;
-        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(),
+        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(), 
                                              &hints, &res);
         if (getaddrinfo_result)
         {
@@ -101,7 +101,7 @@ namespace ix
             _activeJobs.insert(_id);
         }
 
-        //
+        // 
         // Good resource on thread forced termination
         // https://www.bo-yang.net/2017/11/19/cpp-kill-detached-thread
         //
@@ -141,7 +141,7 @@ namespace ix
     void DNSLookup::run(uint64_t id, const std::string& hostname, int port) // thread runner
     {
         // We don't want to read or write into members variables of an object that could be
-        // gone, so we use temporary variables (res) or we pass in by copy everything that
+        // gone, so we use temporary variables (res) or we pass in by copy everything that 
         // getAddrInfo needs to work.
         std::string errMsg;
         struct addrinfo* res = getAddrInfo(hostname, port, errMsg);

ixwebsocket/IXDNSLookup.h

@@ -3,7 +3,7 @@
  *  Author: Benjamin Sergeant
  *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
  *
- *  Resolve a hostname+port to a struct addrinfo obtained with getaddrinfo
+ *  Resolve a hostname+port to a struct addrinfo obtained with getaddrinfo 
  *  Does this in a background thread so that it can be cancelled, since
  *  getaddrinfo is a blocking call, and we don't want to block the main thread on Mobile.
  */
@@ -20,7 +20,7 @@
 
 struct addrinfo;
 
-namespace ix
+namespace ix 
 {
     class DNSLookup {
     public:
@@ -39,7 +39,7 @@ namespace ix
         struct addrinfo* resolveBlocking(std::string& errMsg,
                                          const CancellationRequest& isCancellationRequested);
 
-        static struct addrinfo* getAddrInfo(const std::string& hostname,
+        static struct addrinfo* getAddrInfo(const std::string& hostname, 
                                             int port,
                                             std::string& errMsg);
 

ixwebsocket/IXEventFd.cpp

@@ -14,7 +14,7 @@
 // eventfd was added in Linux kernel 2.x, and our oldest Android (Kitkat 4.4)
 // is on Kernel 3.x
 //
-// cf Android/Kernel table here
+// cf Android/Kernel table here 
 // https://android.stackexchange.com/questions/51651/which-android-runs-which-linux-kernel
 //
 
@@ -28,9 +28,9 @@
 #include <unistd.h> // for write
 #endif
 
-namespace ix
+namespace ix 
 {
-    EventFd::EventFd() :
+    EventFd::EventFd() : 
         _eventfd(-1)
     {
 #ifdef __linux__
@@ -65,7 +65,7 @@ namespace ix
 #if defined(__linux__)
         if (_eventfd == -1) return false;
 
-        // 0 is a special value ; select will not wake up
+        // 0 is a special value ; select will not wake up 
         uint64_t value = 0;
 
         // we should write 8 bytes for an uint64_t

ixwebsocket/IXEventFd.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-namespace ix
+namespace ix 
 {
     class EventFd {
     public:

ixwebsocket/IXHttpClient.cpp

@@ -1,471 +0,0 @@
-/*
- *  IXHttpClient.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttpClient.h"
-#include "IXUrlParser.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXSocketFactory.h"
-
-#include <sstream>
-#include <iomanip>
-#include <vector>
-#include <cstring>
-
-#include <zlib.h>
-
-namespace ix
-{
-    const std::string HttpClient::kPost = "POST";
-    const std::string HttpClient::kGet = "GET";
-    const std::string HttpClient::kHead = "HEAD";
-
-    HttpClient::HttpClient()
-    {
-
-    }
-
-    HttpClient::~HttpClient()
-    {
-
-    }
-
-    HttpResponse HttpClient::request(
-        const std::string& url,
-        const std::string& verb,
-        const std::string& body,
-        const HttpRequestArgs& args,
-        int redirects)
-    {
-        uint64_t uploadSize = 0;
-        uint64_t downloadSize = 0;
-        int code = 0;
-        WebSocketHttpHeaders headers;
-        std::string payload;
-
-        std::string protocol, host, path, query;
-        int port;
-        bool websocket = false;
-
-        if (!UrlParser::parse(url, protocol, host, path, query, port, websocket))
-        {
-            std::stringstream ss;
-            ss << "Cannot parse url: " << url;
-            return std::make_tuple(code, HttpErrorCode_UrlMalformed,
-                                   headers, payload, ss.str(),
-                                   uploadSize, downloadSize);
-        }
-
-        bool tls = protocol == "https";
-        std::string errorMsg;
-        _socket = createSocket(tls, errorMsg);
-
-        if (!_socket)
-        {
-            return std::make_tuple(code, HttpErrorCode_CannotCreateSocket,
-                                   headers, payload, errorMsg,
-                                   uploadSize, downloadSize);
-        }
-
-        // Build request string
-        std::stringstream ss;
-        ss << verb << " " << path << " HTTP/1.1\r\n";
-        ss << "Host: " << host << "\r\n";
-        ss << "User-Agent: ixwebsocket/1.0.0" << "\r\n";
-        ss << "Accept: */*" << "\r\n";
-
-        if (args.compress)
-        {
-            ss << "Accept-Encoding: gzip" << "\r\n";
-        }
-
-        // Append extra headers
-        for (auto&& it : args.extraHeaders)
-        {
-            ss << it.first << ": " << it.second << "\r\n";
-        }
-
-        if (verb == kPost)
-        {
-            ss << "Content-Length: " << body.size() << "\r\n";
-
-            // Set default Content-Type if unspecified
-            if (args.extraHeaders.find("Content-Type") == args.extraHeaders.end())
-            {
-                ss << "Content-Type: application/x-www-form-urlencoded" << "\r\n";
-            }
-            ss << "\r\n";
-            ss << body;
-        }
-        else
-        {
-            ss << "\r\n";
-        }
-
-        std::string req(ss.str());
-        std::string errMsg;
-        std::atomic<bool> requestInitCancellation(false);
-
-        // Make a cancellation object dealing with connection timeout
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(args.connectTimeout, requestInitCancellation);
-
-        bool success = _socket->connect(host, port, errMsg, isCancellationRequested);
-        if (!success)
-        {
-            std::stringstream ss;
-            ss << "Cannot connect to url: " << url;
-            return std::make_tuple(code, HttpErrorCode_CannotConnect,
-                                   headers, payload, ss.str(),
-                                   uploadSize, downloadSize);
-        }
-
-        // Make a new cancellation object dealing with transfer timeout
-        isCancellationRequested =
-            makeCancellationRequestWithTimeout(args.transferTimeout, requestInitCancellation);
-
-        if (args.verbose)
-        {
-            std::stringstream ss;
-            ss << "Sending " << verb << " request "
-               << "to " << host << ":" << port << std::endl
-               << "request size: " << req.size() << " bytes" << std::endl
-               << "=============" << std::endl
-               << req
-               << "=============" << std::endl
-               << std::endl;
-
-            log(ss.str(), args);
-        }
-
-        if (!_socket->writeBytes(req, isCancellationRequested))
-        {
-            std::string errorMsg("Cannot send request");
-            return std::make_tuple(code, HttpErrorCode_SendError,
-                                   headers, payload, errorMsg,
-                                   uploadSize, downloadSize);
-        }
-
-        uploadSize = req.size();
-
-        auto lineResult = _socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            std::string errorMsg("Cannot retrieve status line");
-            return std::make_tuple(code, HttpErrorCode_CannotReadStatusLine,
-                                   headers, payload, errorMsg,
-                                   uploadSize, downloadSize);
-        }
-
-        if (args.verbose)
-        {
-            std::stringstream ss;
-            ss << "Status line " << line;
-            log(ss.str(), args);
-        }
-
-        if (sscanf(line.c_str(), "HTTP/1.1 %d", &code) != 1)
-        {
-            std::string errorMsg("Cannot parse response code from status line");
-            return std::make_tuple(code, HttpErrorCode_MissingStatus,
-                                   headers, payload, errorMsg,
-                                   uploadSize, downloadSize);
-        }
-
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
-        auto headersValid = result.first;
-        headers = result.second;
-
-        if (!headersValid)
-        {
-            std::string errorMsg("Cannot parse http headers");
-            return std::make_tuple(code, HttpErrorCode_HeaderParsingError,
-                                   headers, payload, errorMsg,
-                                   uploadSize, downloadSize);
-        }
-
-        // Redirect ?
-        if ((code >= 301 && code <= 308) && args.followRedirects)
-        {
-            if (headers.find("Location") == headers.end())
-            {
-                std::string errorMsg("Missing location header for redirect");
-                return std::make_tuple(code, HttpErrorCode_MissingLocation,
-                                       headers, payload, errorMsg,
-                                       uploadSize, downloadSize);
-            }
-
-            if (redirects >= args.maxRedirects)
-            {
-                std::stringstream ss;
-                ss << "Too many redirects: " << redirects;
-                return std::make_tuple(code, HttpErrorCode_TooManyRedirects,
-                                       headers, payload, ss.str(),
-                                       uploadSize, downloadSize);
-            }
-
-            // Recurse
-            std::string location = headers["Location"];
-            return request(location, verb, body, args, redirects+1);
-        }
-
-        if (verb == "HEAD")
-        {
-            return std::make_tuple(code, HttpErrorCode_Ok,
-                                   headers, payload, std::string(),
-                                   uploadSize, downloadSize);
-        }
-
-        // Parse response:
-        if (headers.find("Content-Length") != headers.end())
-        {
-            ssize_t contentLength = -1;
-            ss.str("");
-            ss << headers["Content-Length"];
-            ss >> contentLength;
-
-            payload.reserve(contentLength);
-
-            // FIXME: very inefficient way to read bytes, but it works...
-            for (int i = 0; i < contentLength; ++i)
-            {
-                char c;
-                if (!_socket->readByte(&c, isCancellationRequested))
-                {
-                    return std::make_tuple(code, HttpErrorCode_ReadError,
-                                           headers, payload, "Cannot read byte",
-                                           uploadSize, downloadSize);
-                }
-
-                payload += c;
-            }
-        }
-        else if (headers.find("Transfer-Encoding") != headers.end() &&
-                 headers["Transfer-Encoding"] == "chunked")
-        {
-            std::stringstream ss;
-
-            while (true)
-            {
-                lineResult = _socket->readLine(isCancellationRequested);
-                line = lineResult.second;
-
-                if (!lineResult.first)
-                {
-                    return std::make_tuple(code, HttpErrorCode_ChunkReadError,
-                                           headers, payload, errorMsg,
-                                           uploadSize, downloadSize);
-                }
-
-                uint64_t chunkSize;
-                ss.str("");
-                ss << std::hex << line;
-                ss >> chunkSize;
-
-                if (args.verbose)
-                {
-                    std::stringstream oss;
-                    oss << "Reading " << chunkSize << " bytes"
-                        << std::endl;
-                    log(oss.str(), args);
-                }
-
-                payload.reserve(payload.size() + chunkSize);
-
-                // Read another line
-
-                for (uint64_t i = 0; i < chunkSize; ++i)
-                {
-                    char c;
-                    if (!_socket->readByte(&c, isCancellationRequested))
-                    {
-                        errorMsg = "Cannot read byte";
-                        return std::make_tuple(code, HttpErrorCode_ChunkReadError,
-                                               headers, payload, errorMsg,
-                                               uploadSize, downloadSize);
-                    }
-
-                    payload += c;
-                }
-
-                lineResult = _socket->readLine(isCancellationRequested);
-
-                if (!lineResult.first)
-                {
-                    return std::make_tuple(code, HttpErrorCode_ChunkReadError,
-                                           headers, payload, errorMsg,
-                                           uploadSize, downloadSize);
-                }
-
-                if (chunkSize == 0) break;
-            }
-        }
-        else if (code == 204)
-        {
-            ; // 204 is NoContent response code
-        }
-        else
-        {
-            std::string errorMsg("Cannot read http body");
-            return std::make_tuple(code, HttpErrorCode_CannotReadBody,
-                                   headers, payload, errorMsg,
-                                   uploadSize, downloadSize);
-        }
-
-        downloadSize = payload.size();
-
-        // If the content was compressed with gzip, decode it
-        if (headers["Content-Encoding"] == "gzip")
-        {
-            std::string decompressedPayload;
-            if (!gzipInflate(payload, decompressedPayload))
-            {
-                std::string errorMsg("Error decompressing payload");
-                return std::make_tuple(code, HttpErrorCode_Gzip,
-                                       headers, payload, errorMsg,
-                                       uploadSize, downloadSize);
-            }
-            payload = decompressedPayload;
-        }
-
-        return std::make_tuple(code, HttpErrorCode_Ok,
-                               headers, payload, std::string(),
-                               uploadSize, downloadSize);
-    }
-
-    HttpResponse HttpClient::get(const std::string& url,
-                                 const HttpRequestArgs& args)
-    {
-        return request(url, kGet, std::string(), args);
-    }
-
-    HttpResponse HttpClient::head(const std::string& url,
-                                  const HttpRequestArgs& args)
-    {
-        return request(url, kHead, std::string(), args);
-    }
-
-    HttpResponse HttpClient::post(const std::string& url,
-                                  const HttpParameters& httpParameters,
-                                  const HttpRequestArgs& args)
-    {
-        return request(url, kPost, serializeHttpParameters(httpParameters), args);
-    }
-
-    HttpResponse HttpClient::post(const std::string& url,
-                                  const std::string& body,
-                                  const HttpRequestArgs& args)
-    {
-        return request(url, kPost, body, args);
-    }
-
-    std::string HttpClient::urlEncode(const std::string& value)
-    {
-        std::ostringstream escaped;
-        escaped.fill('0');
-        escaped << std::hex;
-
-        for (std::string::const_iterator i = value.begin(), n = value.end();
-             i != n; ++i)
-        {
-            std::string::value_type c = (*i);
-
-            // Keep alphanumeric and other accepted characters intact
-            if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
-            {
-                escaped << c;
-                continue;
-            }
-
-            // Any other characters are percent-encoded
-            escaped << std::uppercase;
-            escaped << '%' << std::setw(2) << int((unsigned char) c);
-            escaped << std::nouppercase;
-        }
-
-        return escaped.str();
-    }
-
-    std::string HttpClient::serializeHttpParameters(const HttpParameters& httpParameters)
-    {
-        std::stringstream ss;
-        size_t count = httpParameters.size();
-        size_t i = 0;
-
-        for (auto&& it : httpParameters)
-        {
-            ss << urlEncode(it.first)
-               << "="
-               << urlEncode(it.second);
-
-            if (i++ < (count-1))
-            {
-               ss << "&";
-            }
-        }
-        return ss.str();
-    }
-
-    bool HttpClient::gzipInflate(
-        const std::string& in,
-        std::string& out)
-    {
-        z_stream inflateState;
-        std::memset(&inflateState, 0, sizeof(inflateState));
-
-        inflateState.zalloc = Z_NULL;
-        inflateState.zfree = Z_NULL;
-        inflateState.opaque = Z_NULL;
-        inflateState.avail_in = 0;
-        inflateState.next_in = Z_NULL;
-
-        if (inflateInit2(&inflateState, 16+MAX_WBITS) != Z_OK)
-        {
-            return false;
-        }
-
-        inflateState.avail_in = (uInt) in.size();
-        inflateState.next_in = (unsigned char *)(const_cast<char *>(in.data()));
-
-        const int kBufferSize = 1 << 14;
-
-        std::unique_ptr<unsigned char[]> compressBuffer =
-            std::make_unique<unsigned char[]>(kBufferSize);
-
-        do
-        {
-            inflateState.avail_out = (uInt) kBufferSize;
-            inflateState.next_out = compressBuffer.get();
-
-            int ret = inflate(&inflateState, Z_SYNC_FLUSH);
-
-            if (ret == Z_NEED_DICT || ret == Z_DATA_ERROR || ret == Z_MEM_ERROR)
-            {
-                inflateEnd(&inflateState);
-                return false;
-            }
-
-            out.append(
-                reinterpret_cast<char *>(compressBuffer.get()),
-                kBufferSize - inflateState.avail_out
-            );
-        } while (inflateState.avail_out == 0);
-
-        inflateEnd(&inflateState);
-        return true;
-    }
-
-    void HttpClient::log(const std::string& msg,
-                         const HttpRequestArgs& args)
-    {
-        if (args.logger)
-        {
-            args.logger(msg);
-        }
-    }
-}

ixwebsocket/IXHttpClient.h

@@ -1,106 +0,0 @@
-/*
- *  IXHttpClient.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <algorithm>
-#include <functional>
-#include <mutex>
-#include <atomic>
-#include <tuple>
-#include <memory>
-#include <map>
-
-#include "IXSocket.h"
-#include "IXWebSocketHttpHeaders.h"
-
-namespace ix
-{
-    enum HttpErrorCode
-    {
-        HttpErrorCode_Ok = 0,
-        HttpErrorCode_CannotConnect = 1,
-        HttpErrorCode_Timeout = 2,
-        HttpErrorCode_Gzip = 3,
-        HttpErrorCode_UrlMalformed = 4,
-        HttpErrorCode_CannotCreateSocket = 5,
-        HttpErrorCode_SendError = 6,
-        HttpErrorCode_ReadError = 7,
-        HttpErrorCode_CannotReadStatusLine = 8,
-        HttpErrorCode_MissingStatus = 9,
-        HttpErrorCode_HeaderParsingError = 10,
-        HttpErrorCode_MissingLocation = 11,
-        HttpErrorCode_TooManyRedirects = 12,
-        HttpErrorCode_ChunkReadError = 13,
-        HttpErrorCode_CannotReadBody = 14
-    };
-
-    using HttpResponse = std::tuple<int, // status
-                                    HttpErrorCode, // error code
-                                    WebSocketHttpHeaders,
-                                    std::string, // payload
-                                    std::string, // error msg
-                                    uint64_t,    // upload size
-                                    uint64_t>;   // download size
-
-    using HttpParameters = std::map<std::string, std::string>;
-    using Logger = std::function<void(const std::string&)>;
-
-    struct HttpRequestArgs
-    {
-        std::string url;
-        WebSocketHttpHeaders extraHeaders;
-        std::string body;
-        int connectTimeout;
-        int transferTimeout;
-        bool followRedirects;
-        int maxRedirects;
-        bool verbose;
-        bool compress;
-        Logger logger;
-    };
-
-    class HttpClient {
-    public:
-        HttpClient();
-        ~HttpClient();
-
-        HttpResponse get(const std::string& url,
-                         const HttpRequestArgs& args);
-        HttpResponse head(const std::string& url,
-                          const HttpRequestArgs& args);
-
-        HttpResponse post(const std::string& url,
-                          const HttpParameters& httpParameters,
-                          const HttpRequestArgs& args);
-        HttpResponse post(const std::string& url,
-                          const std::string& body,
-                          const HttpRequestArgs& args);
-
-    private:
-        HttpResponse request(const std::string& url,
-                             const std::string& verb,
-                             const std::string& body,
-                             const HttpRequestArgs& args,
-                             int redirects = 0);
-
-        std::string serializeHttpParameters(const HttpParameters& httpParameters);
-
-        std::string urlEncode(const std::string& value);
-
-        void log(const std::string& msg, const HttpRequestArgs& args);
-
-        bool gzipInflate(
-            const std::string& in,
-            std::string& out);
-
-        std::shared_ptr<Socket> _socket;
-
-        const static std::string kPost;
-        const static std::string kGet;
-        const static std::string kHead;
-    };
-}

ixwebsocket/IXProgressCallback.h

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

ixwebsocket/IXSocket.cpp

@@ -15,16 +15,17 @@
 #include <stdint.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <poll.h>
 
 #include <algorithm>
 #include <iostream>
 
-namespace ix
+namespace ix 
 {
     const int Socket::kDefaultPollNoTimeout = -1; // No poll timeout by default
     const int Socket::kDefaultPollTimeout = kDefaultPollNoTimeout;
 
-    Socket::Socket(int fd) :
+    Socket::Socket(int fd) : 
         _sockfd(fd)
     {
 
@@ -43,22 +44,21 @@ namespace ix
             return;
         }
 
-        fd_set rfds;
-        FD_ZERO(&rfds);
-        FD_SET(_sockfd, &rfds);
-
 #ifdef __linux__
-        FD_SET(_eventfd.getFd(), &rfds);
+        constexpr int nfds = 2;
+#else
+        constexpr int nfds = 1;
 #endif
 
-        struct timeval timeout;
+        struct pollfd fds[nfds];
-        timeout.tv_sec = timeoutSecs;
+        fds[0].fd = _sockfd;
-        timeout.tv_usec = 0;
+        fds[0].events = POLLIN;
 
-        int sockfd = _sockfd;
+#ifdef __linux__
-        int nfds = (std::max)(sockfd, _eventfd.getFd());
+        fds[1].fd = _eventfd.getFd();
-        int ret = select(nfds + 1, &rfds, nullptr, nullptr,
+        fds[1].events = POLLIN;
-                         (timeoutSecs < 0) ? nullptr : &timeout);
+#endif
+        int ret = ::poll(fds, nfds, timeoutSecs * 1000);
 
         PollResultType pollResult = PollResultType_ReadyForRead;
         if (ret < 0)
@@ -71,6 +71,7 @@ namespace ix
         }
 
         onPollCallback(pollResult);
+
     }
 
     void Socket::wakeUpFromPoll()
@@ -150,7 +151,7 @@ namespace ix
 #ifdef _WIN32
         INT rc;
         WSADATA wsaData;
-
+        
         rc = WSAStartup(MAKEWORD(2, 2), &wsaData);
         return rc != 0;
 #else

ixwebsocket/IXSocket.h

@@ -19,7 +19,7 @@ typedef SSIZE_T ssize_t;
 #include "IXEventFd.h"
 #include "IXCancellationRequest.h"
 
-namespace ix
+namespace ix 
 {
     enum PollResultType
     {
@@ -42,7 +42,7 @@ namespace ix
         virtual void wakeUpFromPoll();
 
         // Virtual methods
-        virtual bool connect(const std::string& url,
+        virtual bool connect(const std::string& url, 
                              int port,
                              std::string& errMsg,
                              const CancellationRequest& isCancellationRequested);

ixwebsocket/IXSocketAppleSSL.cpp

@@ -50,7 +50,7 @@ OSStatus read_from_socket(SSLConnectionRef connection, void *data, size_t *len)
         else
             return noErr;
     }
-    else if (0 == status)
+    else if (0 == status) 
     {
         *len = 0;
         return errSSLClosedGraceful;
@@ -102,7 +102,7 @@ OSStatus write_to_socket(SSLConnectionRef connection, const void *data, size_t *
     else
     {
         *len = 0;
-        if (EAGAIN == errno)
+        if (EAGAIN == errno) 
         {
             return errSSLWouldBlock;
         }
@@ -141,7 +141,7 @@ std::string getSSLErrorDescription(OSStatus status)
 
 } // anonymous namespace
 
-namespace ix
+namespace ix 
 {
     SocketAppleSSL::SocketAppleSSL(int fd) : Socket(fd),
         _sslContext(nullptr)
@@ -176,11 +176,11 @@ namespace ix
 
             do {
                 status = SSLHandshake(_sslContext);
-            } while (errSSLWouldBlock == status ||
+            } while (errSSLWouldBlock == status || 
                      errSSLServerAuthCompleted == status);
         }
 
-        if (noErr != status)
+        if (noErr != status) 
         {
             errMsg = getSSLErrorDescription(status);
             close();
@@ -230,7 +230,7 @@ namespace ix
     ssize_t SocketAppleSSL::recv(void* buf, size_t nbyte)
     {
         OSStatus status = errSSLWouldBlock;
-        while (errSSLWouldBlock == status)
+        while (errSSLWouldBlock == status) 
         {
             size_t processed = 0;
             std::lock_guard<std::mutex> lock(_mutex);
@@ -239,7 +239,7 @@ namespace ix
             if (processed > 0)
                 return (ssize_t) processed;
 
-            // The connection was reset, inform the caller that this
+            // The connection was reset, inform the caller that this 
             // Socket should close
             if (status == errSSLClosedGraceful ||
                 status == errSSLClosedNoNotify ||

ixwebsocket/IXSocketAppleSSL.h

@@ -14,15 +14,15 @@
 
 #include <mutex>
 
-namespace ix
+namespace ix 
 {
-    class SocketAppleSSL : public Socket
+    class SocketAppleSSL : public Socket 
     {
     public:
         SocketAppleSSL(int fd = -1);
         ~SocketAppleSSL();
 
-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& host, 
                              int port,
                              std::string& errMsg,
                              const CancellationRequest& isCancellationRequested) final;

ixwebsocket/IXSocketConnect.cpp

@@ -30,7 +30,7 @@ namespace
     }
 }
 
-namespace ix
+namespace ix 
 {
     //
     // This function can be cancelled every 50 ms
@@ -42,7 +42,7 @@ namespace ix
                                         const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
-
+        
         int fd = socket(address->ai_family,
                         address->ai_socktype,
                         address->ai_protocol);
@@ -72,7 +72,7 @@ namespace ix
                 errMsg = "Cancelled";
                 return -1;
             }
-
+            
             // Use select to check the status of the new connection
             struct timeval timeout;
             timeout.tv_sec = 0;
@@ -179,7 +179,7 @@ namespace ix
         // 3. (apple) prevent SIGPIPE from being emitted when the remote end disconnect
 #ifdef SO_NOSIGPIPE
         int value = 1;
-        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE,
+        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, 
                    (void *)&value, sizeof(value));
 #endif
     }

ixwebsocket/IXSocketConnect.h

@@ -12,7 +12,7 @@
 
 struct addrinfo;
 
-namespace ix
+namespace ix 
 {
     class SocketConnect {
     public:

ixwebsocket/IXSocketFactory.cpp

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

ixwebsocket/IXSocketFactory.h

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

ixwebsocket/IXSocketOpenSSL.cpp

@@ -18,12 +18,12 @@
 #include <errno.h>
 #define socketerrno errno
 
-namespace ix
+namespace ix 
 {
     std::atomic<bool> SocketOpenSSL::_openSSLInitializationSuccessful(false);
 
     SocketOpenSSL::SocketOpenSSL(int fd) : Socket(fd),
-        _ssl_connection(nullptr),
+        _ssl_connection(nullptr), 
         _ssl_context(nullptr)
     {
         std::call_once(_openSSLInitFlag, &SocketOpenSSL::openSSLInitialize, this);
@@ -80,7 +80,7 @@ namespace ix
                 return "OpenSSL failed - underlying BIO reported an I/O error";
             }
         }
-        else if (err == SSL_ERROR_SSL)
+        else if (err == SSL_ERROR_SSL) 
         {
             e = ERR_get_error();
             std::string errMsg("OpenSSL failed - ");
@@ -149,7 +149,7 @@ namespace ix
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
         // Check server name
         bool hostname_verifies_ok = false;
-        STACK_OF(GENERAL_NAME) *san_names =
+        STACK_OF(GENERAL_NAME) *san_names = 
             (STACK_OF(GENERAL_NAME)*) X509_get_ext_d2i((X509 *)server_cert,
                                                        NID_subject_alt_name, NULL, NULL);
         if (san_names)
@@ -160,8 +160,8 @@ namespace ix
                 if (sk_name->type == GEN_DNS)
                 {
                     char *name = (char *)ASN1_STRING_data(sk_name->d.dNSName);
-                    if ((size_t)ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) &&
+                    if ((size_t)ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) && 
-                        checkHost(hostname, name))
+                        checkHost(hostname, name)) 
                     {
                         hostname_verifies_ok = true;
                         break;
@@ -185,8 +185,8 @@ namespace ix
                     ASN1_STRING *cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
                     char *cn = (char *)ASN1_STRING_data(cn_asn1);
 
-                    if ((size_t)ASN1_STRING_length(cn_asn1) == strlen(cn) &&
+                    if ((size_t)ASN1_STRING_length(cn_asn1) == strlen(cn) && 
-                       checkHost(hostname, cn))
+                       checkHost(hostname, cn)) 
                     {
                         hostname_verifies_ok = true;
                     }
@@ -205,7 +205,7 @@ namespace ix
         return true;
     }
 
-    bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg)
+    bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg) 
     {
         while (true)
         {

ixwebsocket/IXSocketOpenSSL.h

@@ -17,15 +17,15 @@
 
 #include <mutex>
 
-namespace ix
+namespace ix 
 {
-    class SocketOpenSSL : public Socket
+    class SocketOpenSSL : public Socket 
     {
     public:
         SocketOpenSSL(int fd = -1);
         ~SocketOpenSSL();
 
-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& host, 
                              int port,
                              std::string& errMsg,
                              const CancellationRequest& isCancellationRequested) final;

ixwebsocket/IXSocketSChannel.cpp

@@ -47,7 +47,7 @@
 // link with ntdsapi.lib for DsMakeSpn function
 #pragma comment(lib, "ntdsapi.lib")
 
-// The following function assumes that Winsock
+// The following function assumes that Winsock 
 // has already been initialized
 
 
@@ -59,7 +59,7 @@
 # error("This file should only be built on Windows")
 #endif
 
-namespace ix
+namespace ix 
 {
     SocketSChannel::SocketSChannel()
     {
@@ -68,7 +68,7 @@ namespace ix
 
     SocketSChannel::~SocketSChannel()
     {
-
+        
     }
 
     bool SocketSChannel::connect(const std::string& host,
@@ -78,7 +78,7 @@ namespace ix
         return Socket::connect(host, port, errMsg);
     }
 
-
+    
     void SocketSChannel::secureSocket()
     {
         // there will be a lot to do here ...

ixwebsocket/IXSocketSChannel.h

@@ -8,15 +8,15 @@
 
 #include "IXSocket.h"
 
-namespace ix
+namespace ix 
 {
-    class SocketSChannel : public Socket
+    class SocketSChannel : public Socket 
     {
     public:
         SocketSChannel();
         ~SocketSChannel();
 
-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& host, 
                              int port,
                              std::string& errMsg) final;
         virtual void close() final;

ixwebsocket/IXSocketServer.cpp

@@ -14,7 +14,7 @@
 #include <future>
 #include <string.h>
 
-namespace ix
+namespace ix 
 {
     const int SocketServer::kDefaultPort(8080);
     const std::string SocketServer::kDefaultHost("127.0.0.1");
@@ -83,7 +83,7 @@ namespace ix
         server.sin_family = AF_INET;
         server.sin_port   = htons(_port);
 
-        // Using INADDR_ANY trigger a pop-up box as binding to any address is detected
+        // Using INADDR_ANY trigger a pop-up box as binding to any address is detected 
         // by the osx firewall. We need to codesign the binary with a self-signed cert
         // to allow that, but this is a bit of a pain. (this is what node or python would do).
         //
@@ -216,7 +216,7 @@ namespace ix
 
             // Launch the handleConnection work asynchronously in its own thread.
             //
-            // the destructor of a future returned by std::async blocks,
+            // the destructor of a future returned by std::async blocks, 
             // so we need to declare it outside of this loop
             f = std::async(std::launch::async,
                            &SocketServer::handleConnection,

ixwebsocket/IXSocketServer.h

@@ -16,7 +16,7 @@
 #include <atomic>
 #include <condition_variable>
 
-namespace ix
+namespace ix 
 {
     class SocketServer {
     public:

ixwebsocket/IXUrlParser.cpp

@@ -1,104 +0,0 @@
-/*
- *  IXUrlParser.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXUrlParser.h"
-
-#include <iostream>
-#include <sstream>
-
-
-namespace ix
-{
-    //
-    // The only difference between those 2 regex is the protocol
-    //
-    std::regex UrlParser::_httpRegex("(http|https)://([^/ :]+):?([^/ ]*)(/?[^ #?]*)\\x3f?([^ #]*)#?([^ ]*)");
-    std::regex UrlParser::_webSocketRegex("(ws|wss)://([^/ :]+):?([^/ ]*)(/?[^ #?]*)\\x3f?([^ #]*)#?([^ ]*)");
-
-    bool UrlParser::parse(const std::string& url,
-                          std::string& protocol,
-                          std::string& host,
-                          std::string& path,
-                          std::string& query,
-                          int& port,
-                          bool websocket)
-    {
-        std::cmatch what;
-        if (!regex_match(url.c_str(), what,
-                         websocket ? _webSocketRegex : _httpRegex))
-        {
-            return false;
-        }
-
-        std::string portStr;
-
-        protocol = std::string(what[1].first, what[1].second);
-        host     = std::string(what[2].first, what[2].second);
-        portStr  = std::string(what[3].first, what[3].second);
-        path     = std::string(what[4].first, what[4].second);
-        query    = std::string(what[5].first, what[5].second);
-
-        if (portStr.empty())
-        {
-            if (protocol == "ws" || protocol == "http")
-            {
-                port = 80;
-            }
-            else if (protocol == "wss" || protocol == "https")
-            {
-                port = 443;
-            }
-            else
-            {
-                // Invalid protocol. Should be caught by regex check
-                // but this missing branch trigger cpplint linter.
-                return false;
-            }
-        }
-        else
-        {
-            std::stringstream ss;
-            ss << portStr;
-            ss >> port;
-        }
-
-        if (path.empty())
-        {
-            path = "/";
-        }
-        else if (path[0] != '/')
-        {
-            path = '/' + path;
-        }
-
-        if (!query.empty())
-        {
-            path += "?";
-            path += query;
-        }
-
-        return true;
-    }
-
-    void UrlParser::printUrl(const std::string& url, bool websocket)
-    {
-        std::string protocol, host, path, query;
-        int port {0};
-
-        if (!parse(url, protocol, host, path, query, port, websocket))
-        {
-            return;
-        }
-
-        std::cout << "[" << url << "]" << std::endl;
-        std::cout << protocol << std::endl;
-        std::cout << host << std::endl;
-        std::cout << port << std::endl;
-        std::cout << path << std::endl;
-        std::cout << query << std::endl;
-        std::cout << "-------------------------------" << std::endl;
-    }
-}

ixwebsocket/IXUrlParser.h

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

ixwebsocket/IXWebSocket.cpp

@@ -50,7 +50,7 @@ namespace ix
         );
     }
 
-    WebSocket::~WebSocket()
+    WebSocket::~WebSocket() 
     {
         stop();
     }
@@ -135,7 +135,7 @@ namespace ix
         }
 
         _onMessageCallback(WebSocket_MessageType_Open, "", 0,
-                           WebSocketErrorInfo(),
+                           WebSocketErrorInfo(), 
                            WebSocketOpenInfo(status.uri, status.headers),
                            WebSocketCloseInfo());
         return status;
@@ -155,7 +155,7 @@ namespace ix
         }
 
         _onMessageCallback(WebSocket_MessageType_Open, "", 0,
-                           WebSocketErrorInfo(),
+                           WebSocketErrorInfo(), 
                            WebSocketOpenInfo(status.uri, status.headers),
                            WebSocketCloseInfo());
         return status;
@@ -184,7 +184,7 @@ namespace ix
         using millis = std::chrono::duration<double, std::milli>;
         millis duration;
 
-        while (true)
+        while (true) 
         {
             if (isConnected() || isClosing() || _stop || !_automaticReconnection)
             {
@@ -214,7 +214,7 @@ namespace ix
     {
         setThreadName(_url);
 
-        while (true)
+        while (true) 
         {
             if (_stop) return;
 
@@ -223,7 +223,7 @@ namespace ix
 
             if (_stop) return;
 
-            // 2. Poll to see if there's any new data available
+            // 2. Poll to see if there's any new data available 
             _ws.poll();
 
             if (_stop) return;
@@ -273,7 +273,7 @@ namespace ix
 
     void WebSocket::setOnMessageCallback(const OnMessageCallback& callback)
     {
-        _onMessageCallback = callback;
+        _onMessageCallback = callback; 
     }
 
     void WebSocket::setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback)
@@ -294,10 +294,9 @@ namespace ix
         }
     }
 
-    WebSocketSendInfo WebSocket::send(const std::string& text,
+    WebSocketSendInfo WebSocket::send(const std::string& text)
-                                      const OnProgressCallback& onProgressCallback)
     {
-        return sendMessage(text, false, onProgressCallback);
+        return sendMessage(text, false);
     }
 
     WebSocketSendInfo WebSocket::ping(const std::string& text)
@@ -309,9 +308,7 @@ namespace ix
         return sendMessage(text, true);
     }
 
-    WebSocketSendInfo WebSocket::sendMessage(const std::string& text,
+    WebSocketSendInfo WebSocket::sendMessage(const std::string& text, bool ping)
-                                             bool ping,
-                                             const OnProgressCallback& onProgressCallback)
     {
         if (!isConnected()) return WebSocketSendInfo(false);
 
@@ -333,7 +330,7 @@ namespace ix
         }
         else
         {
-            webSocketSendInfo = _ws.sendBinary(text, onProgressCallback);
+            webSocketSendInfo = _ws.sendBinary(text);
         }
 
         WebSocket::invokeTrafficTrackerCallback(webSocketSendInfo.wireSize, false);
@@ -343,7 +340,7 @@ namespace ix
 
     ReadyState WebSocket::getReadyState() const
     {
-        switch (_ws.getReadyState())
+        switch (_ws.getReadyState()) 
         {
             case ix::WebSocketTransport::OPEN: return WebSocket_ReadyState_Open;
             case ix::WebSocketTransport::CONNECTING: return WebSocket_ReadyState_Connecting;

ixwebsocket/IXWebSocket.h

@@ -19,12 +19,11 @@
 #include "IXWebSocketSendInfo.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
 #include "IXWebSocketHttpHeaders.h"
-#include "IXProgressCallback.h"
 
 namespace ix
 {
     // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket#Ready_state_constants
-    enum ReadyState
+    enum ReadyState 
     {
         WebSocket_ReadyState_Connecting = 0,
         WebSocket_ReadyState_Open = 1,
@@ -79,7 +78,7 @@ namespace ix
 
     using OnTrafficTrackerCallback = std::function<void(size_t size, bool incoming)>;
 
-    class WebSocket
+    class WebSocket 
     {
     public:
         WebSocket();
@@ -98,8 +97,7 @@ namespace ix
         WebSocketInitResult connect(int timeoutSecs);
         void run();
 
-        WebSocketSendInfo send(const std::string& text,
+        WebSocketSendInfo send(const std::string& text);
-                               const OnProgressCallback& onProgressCallback = nullptr);
         WebSocketSendInfo ping(const std::string& text);
         void close();
 
@@ -117,9 +115,7 @@ namespace ix
 
     private:
 
-        WebSocketSendInfo sendMessage(const std::string& text,
+        WebSocketSendInfo sendMessage(const std::string& text, bool ping);
-                                      bool ping,
-                                      const OnProgressCallback& callback = nullptr);
 
         bool isConnected() const;
         bool isClosing() const;

ixwebsocket/IXWebSocketErrorInfo.h

@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace ix
+namespace ix 
 {
     struct WebSocketErrorInfo
     {

ixwebsocket/IXWebSocketHandshake.cpp

@@ -6,7 +6,6 @@
 
 #include "IXWebSocketHandshake.h"
 #include "IXSocketConnect.h"
-#include "IXUrlParser.h"
 
 #include "libwshandshake.hpp"
 
@@ -17,7 +16,7 @@
 #include <algorithm>
 
 
-namespace ix
+namespace ix 
 {
     WebSocketHandshake::WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
                                            std::shared_ptr<Socket> socket,
@@ -33,6 +32,90 @@ namespace ix
 
     }
 
+    bool WebSocketHandshake::parseUrl(const std::string& url,
+                                      std::string& protocol,
+                                      std::string& host,
+                                      std::string& path,
+                                      std::string& query,
+                                      int& port)
+    {
+        std::regex ex("(ws|wss)://([^/ :]+):?([^/ ]*)(/?[^ #?]*)\\x3f?([^ #]*)#?([^ ]*)");
+        std::cmatch what;
+        if (!regex_match(url.c_str(), what, ex))
+        {
+            return false;
+        }
+
+        std::string portStr;
+
+        protocol = std::string(what[1].first, what[1].second);
+        host     = std::string(what[2].first, what[2].second);
+        portStr  = std::string(what[3].first, what[3].second);
+        path     = std::string(what[4].first, what[4].second);
+        query    = std::string(what[5].first, what[5].second);
+
+        if (portStr.empty())
+        {
+            if (protocol == "ws")
+            {
+                port = 80;
+            }
+            else if (protocol == "wss")
+            {
+                port = 443;
+            }
+            else
+            {
+                // Invalid protocol. Should be caught by regex check
+                // but this missing branch trigger cpplint linter.
+                return false;
+            }
+        }
+        else
+        {
+            std::stringstream ss;
+            ss << portStr;
+            ss >> port;
+        }
+
+        if (path.empty())
+        {
+            path = "/";
+        }
+        else if (path[0] != '/')
+        {
+            path = '/' + path;
+        }
+
+        if (!query.empty())
+        {
+            path += "?";
+            path += query;
+        }
+
+        return true;
+    }
+
+    void WebSocketHandshake::printUrl(const std::string& url)
+    {
+        std::string protocol, host, path, query;
+        int port {0};
+
+        if (!WebSocketHandshake::parseUrl(url, protocol, host,
+                                          path, query, port))
+        {
+            return;
+        }
+
+        std::cout << "[" << url << "]" << std::endl;
+        std::cout << protocol << std::endl;
+        std::cout << host << std::endl;
+        std::cout << port << std::endl;
+        std::cout << path << std::endl;
+        std::cout << query << std::endl;
+        std::cout << "-------------------------------" << std::endl;
+    }
+
     std::string WebSocketHandshake::trim(const std::string& str)
     {
         std::string out(str);
@@ -88,7 +171,7 @@ namespace ix
 
     std::string WebSocketHandshake::genRandomString(const int len)
     {
-        std::string alphanum =
+        std::string alphanum = 
             "0123456789"
             "ABCDEFGH"
             "abcdefgh";
@@ -109,6 +192,61 @@ namespace ix
         return s;
     }
 
+
+    std::pair<bool, WebSocketHttpHeaders> WebSocketHandshake::parseHttpHeaders(
+        const CancellationRequest& isCancellationRequested)
+    {
+        WebSocketHttpHeaders headers;
+
+        char line[256];
+        int i;
+
+        while (true) 
+        {
+            int colon = 0;
+
+            for (i = 0;
+                 i < 2 || (i < 255 && line[i-2] != '\r' && line[i-1] != '\n');
+                 ++i)
+            {
+                if (!_socket->readByte(line+i, isCancellationRequested))
+                {
+                    return std::make_pair(false, headers);
+                }
+
+                if (line[i] == ':' && colon == 0)
+                {
+                    colon = i;
+                }
+            }
+            if (line[0] == '\r' && line[1] == '\n')
+            {
+                break;
+            }
+
+            // line is a single header entry. split by ':', and add it to our
+            // header map. ignore lines with no colon.
+            if (colon > 0)
+            {
+                line[i] = '\0';
+                std::string lineStr(line);
+                // colon is ':', colon+1 is ' ', colon+2 is the start of the value.
+                // i is end of string (\0), i-colon is length of string minus key;
+                // subtract 1 for '\0', 1 for '\n', 1 for '\r',
+                // 1 for the ' ' after the ':', and total is -4
+                std::string name(lineStr.substr(0, colon));
+                std::string value(lineStr.substr(colon + 2, i - colon - 4));
+
+                // Make the name lower case.
+                std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+
+                headers[name] = value;
+            }
+        }
+
+        return std::make_pair(true, headers);
+    }
+
     WebSocketInitResult WebSocketHandshake::sendErrorResponse(int code, const std::string& reason)
     {
         std::stringstream ss;
@@ -139,7 +277,7 @@ namespace ix
     {
         _requestInitCancellation = false;
 
-        auto isCancellationRequested =
+        auto isCancellationRequested = 
             makeCancellationRequestWithTimeout(timeoutSecs, _requestInitCancellation);
 
         std::string errMsg;
@@ -217,7 +355,7 @@ namespace ix
             return WebSocketInitResult(false, status, ss.str());
         }
 
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
+        auto result = parseHttpHeaders(isCancellationRequested);
         auto headersValid = result.first;
         auto headers = result.second;
 
@@ -234,7 +372,7 @@ namespace ix
         }
 
         // Check the value of the connection field
-        // Some websocket servers (Go/Gorilla?) send lowercase values for the
+        // Some websocket servers (Go/Gorilla?) send lowercase values for the 
         // connection header, so do a case insensitive comparison
         if (!insensitiveStringCompare(headers["connection"], "Upgrade"))
         {
@@ -280,7 +418,7 @@ namespace ix
         // Set the socket to non blocking mode + other tweaks
         SocketConnect::configure(fd);
 
-        auto isCancellationRequested =
+        auto isCancellationRequested = 
             makeCancellationRequestWithTimeout(timeoutSecs, _requestInitCancellation);
 
         std::string remote = std::string("remote fd ") + std::to_string(fd);
@@ -294,7 +432,7 @@ namespace ix
         {
             return sendErrorResponse(400, "Error reading HTTP request line");
         }
-
+        
         // Validate request line (GET /foo HTTP/1.1\r\n)
         auto requestLine = parseRequestLine(line);
         auto method      = std::get<0>(requestLine);
@@ -312,7 +450,7 @@ namespace ix
         }
 
         // Retrieve and validate HTTP headers
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
+        auto result = parseHttpHeaders(isCancellationRequested);
         auto headersValid = result.first;
         auto headers = result.second;
 

ixwebsocket/IXWebSocketHandshake.h

@@ -18,7 +18,7 @@
 #include <memory>
 #include <tuple>
 
-namespace ix
+namespace ix 
 {
     struct WebSocketInitResult
     {
@@ -59,10 +59,19 @@ namespace ix
         WebSocketInitResult serverHandshake(int fd,
                                             int timeoutSecs);
 
+        static bool parseUrl(const std::string& url,
+                             std::string& protocol,
+                             std::string& host,
+                             std::string& path,
+                             std::string& query,
+                             int& port);
+
     private:
+        static void printUrl(const std::string& url);
         std::string genRandomString(const int len);
 
         // Parse HTTP headers
+        std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(const CancellationRequest& isCancellationRequested);
         WebSocketInitResult sendErrorResponse(int code, const std::string& reason);
 
         std::tuple<std::string, std::string, std::string> parseRequestLine(const std::string& line);

ixwebsocket/IXWebSocketHttpHeaders.cpp

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