Add client support for websocket subprotocol. Look for the new addSubProtocol method for details

test/CMakeLists.txt

@@ -44,6 +44,7 @@ set (SOURCES
   IXCobraChatTest.cpp
   IXCobraMetricsPublisherTest.cpp
   IXDNSLookupTest.cpp
+  IXWebSocketSubProtocolTest.cpp
 )
 
 # Some unittest don't work on windows yet

test/IXWebSocketSubProtocolTest.cpp

@@ -0,0 +1,108 @@
+/*
+ *  IXWebSocketServerTest.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2019 Machine Zone. All rights reserved.
+ */
+
+#include "IXTest.h"
+#include "catch.hpp"
+#include <iostream>
+#include <ixwebsocket/IXSocket.h>
+#include <ixwebsocket/IXSocketFactory.h>
+#include <ixwebsocket/IXWebSocket.h>
+#include <ixwebsocket/IXWebSocketServer.h>
+
+using namespace ix;
+
+bool startServer(ix::WebSocketServer& server, std::string& subProtocols)
+{
+    server.setOnConnectionCallback(
+        [&server, &subProtocols](std::shared_ptr<ix::WebSocket> webSocket,
+                                 std::shared_ptr<ConnectionState> connectionState) {
+            webSocket->setOnMessageCallback([webSocket, connectionState, &server, &subProtocols](
+                                                const ix::WebSocketMessagePtr& msg) {
+                if (msg->type == ix::WebSocketMessageType::Open)
+                {
+                    Logger() << "New connection";
+                    Logger() << "id: " << connectionState->getId();
+                    Logger() << "Uri: " << msg->openInfo.uri;
+                    Logger() << "Headers:";
+                    for (auto it : msg->openInfo.headers)
+                    {
+                        Logger() << it.first << ": " << it.second;
+                    }
+
+                    subProtocols = msg->openInfo.headers["Sec-WebSocket-Protocol"];
+                }
+                else if (msg->type == ix::WebSocketMessageType::Close)
+                {
+                    log("Closed connection");
+                }
+                else if (msg->type == ix::WebSocketMessageType::Message)
+                {
+                    for (auto&& client : server.getClients())
+                    {
+                        if (client != webSocket)
+                        {
+                            client->sendBinary(msg->str);
+                        }
+                    }
+                }
+            });
+        });
+
+    auto res = server.listen();
+    if (!res.first)
+    {
+        log(res.second);
+        return false;
+    }
+
+    server.start();
+    return true;
+}
+
+TEST_CASE("subprotocol", "[websocket_subprotocol]")
+{
+    SECTION("Connect to the server")
+    {
+        int port = getFreePort();
+        ix::WebSocketServer server(port);
+
+        std::string subProtocols;
+        startServer(server, subProtocols);
+
+        std::atomic<bool> connected(false);
+        ix::WebSocket webSocket;
+        webSocket.setOnMessageCallback([&connected](const ix::WebSocketMessagePtr& msg) {
+            if (msg->type == ix::WebSocketMessageType::Open)
+            {
+                connected = true;
+                log("Client connected");
+            }
+        });
+
+        webSocket.addSubProtocol("json");
+        webSocket.addSubProtocol("msgpack");
+
+        std::string url;
+        std::stringstream ss;
+        ss << "ws://127.0.0.1:" << port;
+        url = ss.str();
+
+        webSocket.setUrl(url);
+        webSocket.start();
+
+        int attempts = 0;
+        while (!connected)
+        {
+            REQUIRE(attempts++ < 10);
+            ix::msleep(10);
+        }
+
+        webSocket.stop();
+        server.stop();
+
+        REQUIRE(subProtocols == "json,msgpack");
+    }
+}