clang format, based on cpprest

.clang-format

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

ixwebsocket/IXCancellationRequest.h

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

ixwebsocket/IXConnectionState.h

@@ -6,14 +6,15 @@
 
 #pragma once
 
-#include <stdint.h>
-#include <string>
 #include <atomic>
 #include <memory>
+#include <stdint.h>
+#include <string>
 
 namespace ix
 {
-    class ConnectionState {
+    class ConnectionState
+    {
     public:
         ConnectionState();
         virtual ~ConnectionState() = default;
@@ -32,6 +33,4 @@ namespace ix
 
         static std::atomic<uint64_t> _globalId;
     };
-}
+} // namespace ix
-
-

ixwebsocket/IXDNSLookup.h

@@ -11,22 +11,20 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
-
-#include <string>
-#include <thread>
 #include <atomic>
 #include <condition_variable>
 #include <set>
+#include <string>
+#include <thread>
 
 struct addrinfo;
 
 namespace ix
 {
-    class DNSLookup {
+    class DNSLookup
+    {
     public:
-        DNSLookup(const std::string& hostname,
+        DNSLookup(const std::string& hostname, int port, int64_t wait = DNSLookup::kDefaultWait);
-                  int port,
-                  int64_t wait = DNSLookup::kDefaultWait);
         ~DNSLookup();
 
         struct addrinfo* resolve(std::string& errMsg,
@@ -78,4 +76,4 @@ namespace ix
 
         const static int64_t kDefaultWait;
     };
-}
+} // namespace ix

ixwebsocket/IXHttpClient.h

@@ -6,16 +6,15 @@
 
 #pragma once
 
-#include <algorithm>
-#include <functional>
-#include <mutex>
-#include <atomic>
-#include <tuple>
-#include <memory>
-#include <map>
-
 #include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
+#include <algorithm>
+#include <atomic>
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <tuple>
 
 namespace ix
 {
@@ -64,15 +63,14 @@ namespace ix
         OnProgressCallback onProgressCallback;
     };
 
-    class HttpClient {
+    class HttpClient
+    {
     public:
         HttpClient();
         ~HttpClient();
 
-        HttpResponse get(const std::string& url,
+        HttpResponse get(const std::string& url, const HttpRequestArgs& args);
-                         const HttpRequestArgs& args);
+        HttpResponse head(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,
@@ -94,9 +92,7 @@ namespace ix
 
         void log(const std::string& msg, const HttpRequestArgs& args);
 
-        bool gzipInflate(
+        bool gzipInflate(const std::string& in, std::string& out);
-            const std::string& in,
-            std::string& out);
 
         std::shared_ptr<Socket> _socket;
 
@@ -104,4 +100,4 @@ namespace ix
         const static std::string kGet;
         const static std::string kHead;
     };
-}
+} // namespace ix

ixwebsocket/IXNetSystem.h

@@ -28,4 +28,4 @@ namespace ix
 {
     bool initNetSystem();
     bool uninitNetSystem();
-}
+} // namespace ix

ixwebsocket/IXSelectInterrupt.h

@@ -11,7 +11,8 @@
 
 namespace ix
 {
-    class SelectInterrupt {
+    class SelectInterrupt
+    {
     public:
         SelectInterrupt();
         virtual ~SelectInterrupt();
@@ -23,6 +24,4 @@ namespace ix
         virtual uint64_t read();
         virtual int getFd() const;
     };
-}
+} // namespace ix
-
-

ixwebsocket/IXSelectInterruptEventFd.h

@@ -7,13 +7,13 @@
 #pragma once
 
 #include "IXSelectInterrupt.h"
-
 #include <stdint.h>
 #include <string>
 
 namespace ix
 {
-    class SelectInterruptEventFd final : public SelectInterrupt {
+    class SelectInterruptEventFd final : public SelectInterrupt
+    {
     public:
         SelectInterruptEventFd();
         virtual ~SelectInterruptEventFd();
@@ -28,5 +28,4 @@ namespace ix
     private:
         int _eventfd;
     };
-}
+} // namespace ix
-

ixwebsocket/IXSelectInterruptFactory.h

@@ -12,4 +12,4 @@ namespace ix
 {
     class SelectInterrupt;
     std::shared_ptr<SelectInterrupt> createSelectInterrupt();
-}
+} // namespace ix

ixwebsocket/IXSelectInterruptPipe.h

@@ -7,14 +7,14 @@
 #pragma once
 
 #include "IXSelectInterrupt.h"
-
+#include <mutex>
 #include <stdint.h>
 #include <string>
-#include <mutex>
 
 namespace ix
 {
-    class SelectInterruptPipe final : public SelectInterrupt {
+    class SelectInterruptPipe final : public SelectInterrupt
+    {
     public:
         SelectInterruptPipe();
         virtual ~SelectInterruptPipe();
@@ -37,5 +37,4 @@ namespace ix
         static const int kPipeReadIndex;
         static const int kPipeWriteIndex;
     };
-}
+} // namespace ix
-

ixwebsocket/IXSetThreadName.h

@@ -10,4 +10,3 @@ namespace ix
 {
     void setThreadName(const std::string& name);
 }
-

ixwebsocket/IXSocket.h

@@ -6,12 +6,12 @@
 
 #pragma once
 
-#include <string>
-#include <functional>
-#include <mutex>
 #include <atomic>
-#include <vector>
+#include <functional>
 #include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
 
 #ifdef _WIN32
 #include <BaseTsd.h>
@@ -49,7 +49,8 @@ namespace ix
         CloseRequest = 5
     };
 
-    class Socket {
+    class Socket
+    {
     public:
         Socket(int fd = -1);
         virtual ~Socket();
@@ -75,15 +76,11 @@ namespace ix
 
         // Blocking and cancellable versions, working with socket that can be set
         // to non blocking mode. Used during HTTP upgrade.
-        bool readByte(void* buffer,
+        bool readByte(void* buffer, const CancellationRequest& isCancellationRequested);
-                      const CancellationRequest& isCancellationRequested);
+        bool writeBytes(const std::string& str, const CancellationRequest& isCancellationRequested);
-        bool writeBytes(const std::string& str,
-                        const CancellationRequest& isCancellationRequested);
 
-        std::pair<bool, std::string> readLine(
+        std::pair<bool, std::string> readLine(const CancellationRequest& isCancellationRequested);
-            const CancellationRequest& isCancellationRequested);
+        std::pair<bool, std::string> readBytes(size_t length,
-        std::pair<bool, std::string> readBytes(
-            size_t length,
                                                const OnProgressCallback& onProgressCallback,
                                                const CancellationRequest& isCancellationRequested);
 
@@ -111,4 +108,4 @@ namespace ix
 
         std::shared_ptr<SelectInterrupt> _selectInterrupt;
     };
-}
+} // namespace ix

ixwebsocket/IXSocketAppleSSL.h

@@ -6,12 +6,10 @@
 
 #pragma once
 
-#include "IXSocket.h"
 #include "IXCancellationRequest.h"
-
+#include "IXSocket.h"
-#include <Security/Security.h>
 #include <Security/SecureTransport.h>
-
+#include <Security/Security.h>
 #include <mutex>
 
 namespace ix
@@ -37,4 +35,4 @@ namespace ix
         mutable std::mutex _mutex; // AppleSSL routines are not thread-safe
     };
 
-}
+} // namespace ix

ixwebsocket/IXSocketConnect.h

@@ -7,14 +7,14 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
-
 #include <string>
 
 struct addrinfo;
 
 namespace ix
 {
-    class SocketConnect {
+    class SocketConnect
+    {
     public:
         static int connect(const std::string& hostname,
                            int port,
@@ -28,5 +28,4 @@ namespace ix
                                     std::string& errMsg,
                                     const CancellationRequest& isCancellationRequested);
     };
-}
+} // namespace ix
-

ixwebsocket/IXSocketFactory.h

@@ -13,9 +13,7 @@
 namespace ix
 {
     class Socket;
-    std::shared_ptr<Socket> createSocket(bool tls,
+    std::shared_ptr<Socket> createSocket(bool tls, std::string& errorMsg);
-                                         std::string& errorMsg);
 
-    std::shared_ptr<Socket> createSocket(int fd,
+    std::shared_ptr<Socket> createSocket(int fd, std::string& errorMsg);
-                                         std::string& errorMsg);
+} // namespace ix
-}

ixwebsocket/IXSocketOpenSSL.h

@@ -6,17 +6,15 @@
 
 #pragma once
 
-#include "IXSocket.h"
 #include "IXCancellationRequest.h"
-
+#include "IXSocket.h"
+#include <mutex>
 #include <openssl/bio.h>
-#include <openssl/hmac.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
+#include <openssl/hmac.h>
 #include <openssl/ssl.h>
 
-#include <mutex>
-
 namespace ix
 {
     class SocketOpenSSL final : public Socket
@@ -40,9 +38,7 @@ namespace ix
         std::string getSSLError(int ret);
         SSL_CTX* openSSLCreateContext(std::string& errMsg);
         bool openSSLHandshake(const std::string& hostname, std::string& errMsg);
-        bool openSSLCheckServerCert(SSL *ssl,
+        bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
-                                    const std::string& hostname,
-                                    std::string& errMsg);
         bool checkHost(const std::string& host, const char* pattern);
 
         SSL* _ssl_connection;
@@ -54,4 +50,4 @@ namespace ix
         static std::atomic<bool> _openSSLInitializationSuccessful;
     };
 
-}
+} // namespace ix

ixwebsocket/IXSocketSChannel.h

@@ -16,9 +16,7 @@ namespace ix
         SocketSChannel();
         ~SocketSChannel();
 
-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& host, int port, std::string& errMsg) final;
-                             int port,
-                             std::string& errMsg) final;
         virtual void close() final;
 
         // The important override
@@ -31,4 +29,4 @@ namespace ix
     private:
     };
 
-}
+} // namespace ix

ixwebsocket/IXSocketServer.h

@@ -7,28 +7,28 @@
 #pragma once
 
 #include "IXConnectionState.h"
-
-#include <utility> // pair
-#include <string>
-#include <set>
-#include <thread>
-#include <list>
-#include <mutex>
-#include <functional>
-#include <memory>
 #include <atomic>
 #include <condition_variable>
+#include <functional>
+#include <list>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <string>
+#include <thread>
+#include <utility> // pair
 
 namespace ix
 {
-    class SocketServer {
+    class SocketServer
+    {
     public:
         using ConnectionStateFactory = std::function<std::shared_ptr<ConnectionState>()>;
 
         // Each connection is handled by its own worker thread.
         // We use a list as we only care about remove and append operations.
-        using ConnectionThreads = std::list<std::pair<std::shared_ptr<ConnectionState>,
+        using ConnectionThreads =
-                                                      std::thread>>;
+            std::list<std::pair<std::shared_ptr<ConnectionState>, std::thread>>;
 
         SocketServer(int port = SocketServer::kDefaultPort,
                      const std::string& host = SocketServer::kDefaultHost,
@@ -52,7 +52,6 @@ namespace ix
         void wait();
 
     protected:
-
         // Logging
         void logError(const std::string& str);
         void logInfo(const std::string& str);
@@ -93,12 +92,11 @@ namespace ix
         // the factory to create ConnectionState objects
         ConnectionStateFactory _connectionStateFactory;
 
-        virtual void handleConnection(int fd,
+        virtual void handleConnection(int fd, std::shared_ptr<ConnectionState> connectionState) = 0;
-                                      std::shared_ptr<ConnectionState> connectionState) = 0;
         virtual size_t getConnectedClientsCount() = 0;
 
         // Returns true if all connection threads are joined
         void closeTerminatedThreads();
         size_t getConnectionsThreadsCount();
     };
-}
+} // namespace ix

ixwebsocket/IXUrlParser.h

@@ -20,4 +20,4 @@ namespace ix
                           std::string& query,
                           int& port);
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocket.h

@@ -9,18 +9,17 @@
 
 #pragma once
 
+#include "IXProgressCallback.h"
+#include "IXWebSocketCloseConstants.h"
+#include "IXWebSocketErrorInfo.h"
+#include "IXWebSocketHttpHeaders.h"
+#include "IXWebSocketPerMessageDeflateOptions.h"
+#include "IXWebSocketSendInfo.h"
+#include "IXWebSocketTransport.h"
+#include <atomic>
+#include <mutex>
 #include <string>
 #include <thread>
-#include <mutex>
-#include <atomic>
-
-#include "IXWebSocketTransport.h"
-#include "IXWebSocketErrorInfo.h"
-#include "IXWebSocketSendInfo.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketCloseConstants.h"
-#include "IXProgressCallback.h"
 
 namespace ix
 {
@@ -64,9 +63,7 @@ namespace ix
         std::string reason;
         bool remote;
 
-        WebSocketCloseInfo(uint16_t c = 0,
+        WebSocketCloseInfo(uint16_t c = 0, const std::string& r = std::string(), bool rem = false)
-                           const std::string& r = std::string(),
-                           bool rem = false)
             : code(c)
             , reason(r)
             , remote(rem)
@@ -91,7 +88,8 @@ namespace ix
         ~WebSocket();
 
         void setUrl(const std::string& url);
-        void setPerMessageDeflateOptions(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
+        void setPerMessageDeflateOptions(
+            const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
         void setHeartBeatPeriod(int heartBeatPeriodSecs);
         void setPingInterval(int pingIntervalSecs); // alias of setHeartBeatPeriod
         void setPingTimeout(int pingTimeoutSecs);
@@ -116,8 +114,7 @@ namespace ix
                                    const OnProgressCallback& onProgressCallback = nullptr);
         WebSocketSendInfo ping(const std::string& text);
 
-        void close(uint16_t code = 1000,
+        void close(uint16_t code = 1000, const std::string& reason = "Normal closure");
-                   const std::string& reason = "Normal closure");
 
         void setOnMessageCallback(const OnMessageCallback& callback);
         static void setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback);
@@ -138,7 +135,6 @@ namespace ix
         bool isAutomaticReconnectionEnabled() const;
 
     private:
-
         WebSocketSendInfo sendMessage(const std::string& text,
                                       SendMessageKind sendMessageKind,
                                       const OnProgressCallback& callback = nullptr);
@@ -180,4 +176,4 @@ namespace ix
 
         friend class WebSocketServer;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketCloseConstants.h

@@ -26,4 +26,4 @@ namespace ix
         static const std::string kProtocolErrorMessage;
         static const std::string kNoStatusCodeErrorMessage;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketErrorInfo.h

@@ -18,4 +18,4 @@ namespace ix
         std::string reason;
         bool decompressionError = false;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketHandshake.h

@@ -7,15 +7,14 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
+#include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
 #include "IXWebSocketPerMessageDeflate.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXSocket.h"
-
-#include <string>
 #include <atomic>
 #include <chrono>
 #include <memory>
+#include <string>
 #include <tuple>
 
 namespace ix
@@ -42,7 +41,8 @@ namespace ix
         }
     };
 
-    class WebSocketHandshake {
+    class WebSocketHandshake
+    {
     public:
         WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
                            std::shared_ptr<Socket> _socket,
@@ -56,8 +56,7 @@ namespace ix
                                             int port,
                                             int timeoutSecs);
 
-        WebSocketInitResult serverHandshake(int fd,
+        WebSocketInitResult serverHandshake(int fd, int timeoutSecs);
-                                            int timeoutSecs);
 
     private:
         std::string genRandomString(const int len);
@@ -75,4 +74,4 @@ namespace ix
         WebSocketPerMessageDeflateOptions& _perMessageDeflateOptions;
         std::atomic<bool>& _enablePerMessageDeflate;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketHttpHeaders.h

@@ -7,10 +7,9 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
-
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 
 namespace ix
 {
@@ -30,6 +29,5 @@ namespace ix
     using WebSocketHttpHeaders = std::map<std::string, std::string, CaseInsensitiveLess>;
 
     std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::shared_ptr<Socket> socket,
+        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested);
-        const CancellationRequest& isCancellationRequested);
+} // namespace ix
-}

ixwebsocket/IXWebSocketMessageQueue.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include "IXWebSocket.h"
-#include <thread>
 #include <list>
 #include <memory>
+#include <thread>
 
 namespace ix
 {
@@ -50,4 +50,4 @@ namespace ix
         std::mutex _messagesMutex;
         std::list<MessagePtr> _messages;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflate.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <string>
 #include <memory>
+#include <string>
 
 namespace ix
 {
@@ -57,4 +57,4 @@ namespace ix
         std::unique_ptr<WebSocketPerMessageDeflateCompressor> _compressor;
         std::unique_ptr<WebSocketPerMessageDeflateDecompressor> _decompressor;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflateCodec.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include "zlib.h"
-#include <string>
 #include <memory>
+#include <string>
 
 namespace ix
 {
@@ -46,5 +46,4 @@ namespace ix
         z_stream _inflateState;
     };
 
-}
+} // namespace ix
-

ixwebsocket/IXWebSocketPerMessageDeflateOptions.h

@@ -42,4 +42,4 @@ namespace ix
         int _clientMaxWindowBits;
         int _serverMaxWindowBits;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketSendInfo.h

@@ -15,8 +15,7 @@ namespace ix
         size_t payloadSize;
         size_t wireSize;
 
-        WebSocketSendInfo(bool s = false, bool c = false,
+        WebSocketSendInfo(bool s = false, bool c = false, size_t p = 0, size_t w = 0)
-                          size_t p = 0, size_t w = 0)
             : success(s)
             , compressionError(c)
             , payloadSize(p)
@@ -25,4 +24,4 @@ namespace ix
             ;
         }
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketServer.h

@@ -6,24 +6,24 @@
 
 #pragma once
 
-#include <utility> // pair
+#include "IXSocketServer.h"
-#include <string>
+#include "IXWebSocket.h"
-#include <set>
+#include <condition_variable>
-#include <thread>
-#include <mutex>
 #include <functional>
 #include <memory>
-#include <condition_variable>
+#include <mutex>
-
+#include <set>
-#include "IXWebSocket.h"
+#include <string>
-#include "IXSocketServer.h"
+#include <thread>
+#include <utility> // pair
 
 namespace ix
 {
-    using OnConnectionCallback = std::function<void(std::shared_ptr<WebSocket>,
+    using OnConnectionCallback =
-                                                    std::shared_ptr<ConnectionState>)>;
+        std::function<void(std::shared_ptr<WebSocket>, std::shared_ptr<ConnectionState>)>;
 
-    class WebSocketServer final : public SocketServer {
+    class WebSocketServer final : public SocketServer
+    {
     public:
         WebSocketServer(int port = SocketServer::kDefaultPort,
                         const std::string& host = SocketServer::kDefaultHost,
@@ -59,4 +59,4 @@ namespace ix
                                       std::shared_ptr<ConnectionState> connectionState) final;
         virtual size_t getConnectedClientsCount() final;
     };
-}
+} // namespace ix

ixwebsocket/IXWebSocketTransport.h

@@ -10,22 +10,21 @@
 // Adapted from https://github.com/dhbaird/easywsclient
 //
 
-#include <string>
-#include <vector>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <atomic>
-#include <list>
-
-#include "IXWebSocketSendInfo.h"
-#include "IXWebSocketPerMessageDeflate.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketHttpHeaders.h"
 #include "IXCancellationRequest.h"
-#include "IXWebSocketHandshake.h"
 #include "IXProgressCallback.h"
 #include "IXWebSocketCloseConstants.h"
+#include "IXWebSocketHandshake.h"
+#include "IXWebSocketHttpHeaders.h"
+#include "IXWebSocketPerMessageDeflate.h"
+#include "IXWebSocketPerMessageDeflateOptions.h"
+#include "IXWebSocketSendInfo.h"
+#include <atomic>
+#include <functional>
+#include <list>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
 
 namespace ix
 {
@@ -63,14 +62,9 @@ namespace ix
             AbnormalClose
         };
 
-        using OnMessageCallback = std::function<void(const std::string&,
+        using OnMessageCallback =
-                                                     size_t,
+            std::function<void(const std::string&, size_t, bool, MessageKind)>;
-                                                     bool,
+        using OnCloseCallback = std::function<void(uint16_t, const std::string&, size_t, bool)>;
-                                                     MessageKind)>;
-        using OnCloseCallback = std::function<void(uint16_t,
-                                                   const std::string&,
-                                                   size_t,
-                                                   bool)>;
 
         WebSocketTransport();
         ~WebSocketTransport();
@@ -103,19 +97,20 @@ namespace ix
         ReadyState getReadyState() const;
         void setReadyState(ReadyState readyState);
         void setOnCloseCallback(const OnCloseCallback& onCloseCallback);
-        void dispatch(PollResult pollResult,
+        void dispatch(PollResult pollResult, const OnMessageCallback& onMessageCallback);
-                      const OnMessageCallback& onMessageCallback);
         size_t bufferedAmount() const;
 
     private:
         std::string _url;
 
-        struct wsheader_type {
+        struct wsheader_type
+        {
             unsigned header_size;
             bool fin;
             bool rsv1;
             bool mask;
-            enum opcode_type {
+            enum opcode_type
+            {
                 CONTINUATION = 0x0,
                 TEXT_FRAME = 0x1,
                 BINARY_FRAME = 0x2,
@@ -211,7 +206,8 @@ namespace ix
         // No PONG data was received through the socket for longer than ping timeout delay
         bool pingTimeoutExceeded();
 
-        // after calling close(), if no CLOSE frame answer is received back from the remote, we should close the connexion
+        // after calling close(), if no CLOSE frame answer is received back from the remote, we
+        // should close the connexion
         bool closingDelayExceeded();
 
         void initTimePointsAndGCDAfterConnect();
@@ -252,4 +248,4 @@ namespace ix
 
         std::string getMergedChunks() const;
     };
-}
+} // namespace ix

ixwebsocket/LUrlParser.h

@@ -58,12 +58,17 @@ namespace LUrlParser
 
         clParseURL()
             : m_ErrorCode(LUrlParserError_Uninitialized)
-		{}
+        {
+        }
 
         /// return 'true' if the parsing was successful
-		bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
+        bool IsValid() const
+        {
+            return m_ErrorCode == LUrlParserError_Ok;
+        }
 
-		/// helper to convert the port number to int, return 'true' if the port is valid (within the 0..65535 range)
+        /// helper to convert the port number to int, return 'true' if the port is valid (within the
+        /// 0..65535 range)
         bool GetPort(int* OutPort) const;
 
         /// parse the URL
@@ -72,7 +77,8 @@ namespace LUrlParser
     private:
         explicit clParseURL(LUrlParserError ErrorCode)
             : m_ErrorCode(ErrorCode)
-		{}
+        {
+        }
     };
 
 } // namespace LUrlParser

makefile

@@ -40,6 +40,9 @@ run:
 trail:
 	sh third_party/remote_trailing_whitespaces.sh
 
+format:
+	sh third_party/indent.sh
+
 # That target is used to start a node server, but isn't required as we have 
 # a builtin C++ server started in the unittest now
 test_server:

ws/IXRedisClient.h

@@ -6,14 +6,15 @@
 
 #pragma once
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 namespace ix
 {
     class Socket;
 
-    class RedisClient {
+    class RedisClient
+    {
     public:
         using OnRedisSubscribeResponseCallback = std::function<void(const std::string&)>;
         using OnRedisSubscribeCallback = std::function<void(const std::string&)>;
@@ -21,15 +22,11 @@ namespace ix
         RedisClient() = default;
         ~RedisClient() = default;
 
-        bool connect(const std::string& hostname,
+        bool connect(const std::string& hostname, int port);
-                     int port);
 
-        bool auth(const std::string& password,
+        bool auth(const std::string& password, std::string& response);
-                  std::string& response);
 
-        bool publish(const std::string& channel,
+        bool publish(const std::string& channel, const std::string& message, std::string& errMsg);
-                     const std::string& message,
-                     std::string& errMsg);
 
         bool subscribe(const std::string& channel,
                        const OnRedisSubscribeResponseCallback& responseCallback,
@@ -40,5 +37,4 @@ namespace ix
 
         std::shared_ptr<Socket> _socket;
     };
-}
+} // namespace ix
-

ws/IXSentryClient.h

@@ -6,11 +6,10 @@
 
 #pragma once
 
+#include <ixwebsocket/IXHttpClient.h>
 #include <jsoncpp/json/json.h>
 #include <regex>
 
-#include <ixwebsocket/IXHttpClient.h>
-
 namespace ix
 {
     class SentryClient

ws/ixcobra/IXCobraConnection.h

@@ -6,16 +6,15 @@
 
 #pragma once
 
+#include <ixwebsocket/IXWebSocketHttpHeaders.h>
+#include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
+#include <jsoncpp/json/json.h>
+#include <memory>
 #include <mutex>
 #include <queue>
 #include <string>
 #include <thread>
 #include <unordered_map>
-#include <memory>
-
-#include <jsoncpp/json/json.h>
-#include <ixwebsocket/IXWebSocketHttpHeaders.h>
-#include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
 
 namespace ix
 {
@@ -72,8 +71,7 @@ namespace ix
         /// Publish a message to a channel
         ///
         /// No-op if the connection is not established
-        bool publish(const Json::Value& channels,
+        bool publish(const Json::Value& channels, const Json::Value& msg);
-                     const Json::Value& msg);
 
         // Subscribe to a channel, and execute a callback when an incoming
         // message arrives.
@@ -126,8 +124,7 @@ namespace ix
                                  const std::string& errorMsg = std::string(),
                                  const WebSocketHttpHeaders& headers = WebSocketHttpHeaders(),
                                  const std::string& subscriptionId = std::string());
-        void invokeErrorCallback(const std::string& errorMsg,
+        void invokeErrorCallback(const std::string& errorMsg, const std::string& serializedPdu);
-                                 const std::string& serializedPdu);
 
         ///
         /// Member variables

ws/ixcobra/IXCobraMetricsPublisher.h

@@ -7,12 +7,10 @@
 #pragma once
 
 #include "IXCobraMetricsThreadedPublisher.h"
-
+#include <chrono>
 #include <jsoncpp/json/json.h>
-
 #include <string>
 #include <unordered_map>
-#include <chrono>
 
 namespace ix
 {
@@ -28,10 +26,11 @@ namespace ix
         /// to make shouldPush as fast as possible. _enabled default to false.
         ///
         /// The code that set those is ran only once at init, and
-        /// the last value to be set is _enabled, which is also the first value checked in shouldPush,
+        /// the last value to be set is _enabled, which is also the first value checked in
-        /// so there shouldn't be any race condition.
+        /// shouldPush, so there shouldn't be any race condition.
         ///
-        /// 2. The queue of messages is thread safe, so multiple metrics can be safely pushed on multiple threads
+        /// 2. The queue of messages is thread safe, so multiple metrics can be safely pushed on
+        /// multiple threads
         ///
         /// 3. Access to _last_update is protected as it needs to be read/write.
         ///
@@ -62,40 +61,44 @@ namespace ix
         void push(const std::string& id,
                   const CobraMetricsPublisher::Message& data = CobraMetricsPublisher::Message());
 
-        /// Richer interface using json, which supports types (bool, int, float) and hierarchies of elements
+        /// Richer interface using json, which supports types (bool, int, float) and hierarchies of
+        /// elements
         ///
-        /// The shouldPushTest argument should be set to false, and used in combination with the shouldPush method
+        /// The shouldPushTest argument should be set to false, and used in combination with the
-        /// for places where we want to be as lightweight as possible when collecting metrics. When set to false,
+        /// shouldPush method for places where we want to be as lightweight as possible when
-        /// it is used so that we don't do double work when computing whether a metrics should be sent or not.
+        /// collecting metrics. When set to false, it is used so that we don't do double work when
-        void push(const std::string& id,
+        /// computing whether a metrics should be sent or not.
-                  const Json::Value& data,
+        void push(const std::string& id, const Json::Value& data, bool shouldPushTest = true);
-                  bool shouldPushTest = true);
 
         /// Interface used by lua. msg is a json encoded string.
-        void push(const std::string& id,
+        void push(const std::string& id, const std::string& data, bool shouldPushTest = true);
-                  const std::string& data,
-                  bool shouldPushTest = true);
 
         /// Tells whether a metric can be pushed.
         /// A metric can be pushed if it satisfies those conditions:
         ///
         /// 1. the metrics system should be enabled
         /// 2. the metrics shouldn't be black-listed
-        /// 3. the metrics shouldn't have reached its rate control limit at this "sampling"/"calling" time
+        /// 3. the metrics shouldn't have reached its rate control limit at this
+        /// "sampling"/"calling" time
         bool shouldPush(const std::string& id) const;
 
         /// Get generic information json object
         Json::Value& getGenericAttributes();
 
         /// Set generic information values
-        void setGenericAttributes(const std::string& attrName,
+        void setGenericAttributes(const std::string& attrName, const Json::Value& value);
-                                  const Json::Value& value);
 
         /// Set a unique id for the session. A uuid can be used.
-        void setSession(const std::string& session) { _session = session; }
+        void setSession(const std::string& session)
+        {
+            _session = session;
+        }
 
         /// Get the unique id used to identify the current session
-        const std::string& getSession() const { return _session; }
+        const std::string& getSession() const
+        {
+            return _session;
+        }
 
         /// Return the number of milliseconds since the epoch (~1970)
         uint64_t getMillisecondsSinceEpoch() const;
@@ -117,7 +120,6 @@ namespace ix
         bool isAuthenticated() const;
 
     private:
-
         /// Lookup an id in our metrics to see whether it is blacklisted
         /// Complexity is logarithmic
         bool isMetricBlacklisted(const std::string& id) const;
@@ -150,15 +152,16 @@ namespace ix
         /// Metrics control (black list + rate control)
         std::vector<std::string> _blacklist;
         std::unordered_map<std::string, int> _rate_control;
-        std::unordered_map<std::string, std::chrono::time_point<std::chrono::steady_clock>> _last_update;
+        std::unordered_map<std::string, std::chrono::time_point<std::chrono::steady_clock>>
+            _last_update;
         mutable std::mutex _last_update_mutex; // protect access to _last_update
 
         // const strings for internal ids
         static const std::string kSetRateControlId;
         static const std::string kSetBlacklistId;
 
-        /// Our protocol version. Can be used by subscribers who would want to be backward compatible
+        /// Our protocol version. Can be used by subscribers who would want to be backward
-        /// if we change the way we arrange data
+        /// compatible if we change the way we arrange data
         static const int kVersion;
     };
 

ws/ixcobra/IXCobraMetricsThreadedPublisher.h

@@ -7,16 +7,14 @@
 #pragma once
 
 #include "IXCobraConnection.h"
-
-#include <jsoncpp/json/json.h>
-
-#include <string>
-#include <queue>
-#include <mutex>
-#include <thread>
-#include <map>
 #include <atomic>
 #include <condition_variable>
+#include <jsoncpp/json/json.h>
+#include <map>
+#include <mutex>
+#include <queue>
+#include <string>
+#include <thread>
 
 namespace ix
 {
@@ -67,8 +65,7 @@ namespace ix
         };
 
         /// Push a message to be processed by the background thread
-        void pushMessage(MessageKind messageKind,
+        void pushMessage(MessageKind messageKind, const Json::Value& msg);
-                         const Json::Value& msg);
 
         /// Get a wait time which is increasing exponentially based on the number of retries
         uint64_t getWaitTimeExp(int retry_count);

ws/ixcore/utils/IXCoreLogger.h

@@ -3,20 +3,19 @@
 
 namespace ix
 {
-
     class IXCoreLogger
     {
     public:
         using LogFunc = std::function<void(const char*)>;
         static void Log(const char* msg);
 
-    static void setLogFunction(LogFunc& func) {
+        static void setLogFunction(LogFunc& func)
+        {
             _currentLogger = func;
         }
 
     private:
         static LogFunc _currentLogger;
-
     };
 
-} // ix
+} // namespace ix

ws/ixcrypto/IXBase64.h

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

ws/ixcrypto/IXHash.h

@@ -13,4 +13,3 @@ namespace ix
 {
     uint64_t djb2Hash(const std::vector<uint8_t>& data);
 }
-

ws/ixcrypto/IXUuid.h

@@ -14,4 +14,4 @@ namespace ix
      */
     std::string uuid4();
 
-}
+} // namespace ix

ws/snake/IXAppConfig.h

@@ -6,11 +6,10 @@
 
 #pragma once
 
+#include "nlohmann/json.hpp"
 #include <string>
 #include <vector>
 
-#include "nlohmann/json.hpp"
-
 namespace snake
 {
     struct AppConfig
@@ -31,16 +30,11 @@ namespace snake
         bool verbose;
     };
 
-    bool isAppKeyValid(
+    bool isAppKeyValid(const AppConfig& appConfig, std::string appkey);
-        const AppConfig& appConfig,
-        std::string appkey);
 
-    std::string getRoleSecret(
+    std::string getRoleSecret(const AppConfig& appConfig, std::string appkey, std::string role);
-        const AppConfig& appConfig,
-        std::string appkey,
-        std::string role);
 
     std::string generateNonce();
 
     void dumpConfig(const AppConfig& appConfig);
-}
+} // namespace snake

ws/snake/IXSnakeConnectionState.h

@@ -6,27 +6,47 @@
 
 #pragma once
 
-#include <string>
-#include <future>
-
-#include <ixwebsocket/IXConnectionState.h>
 #include "IXRedisClient.h"
+#include <future>
+#include <ixwebsocket/IXConnectionState.h>
+#include <string>
 
 namespace snake
 {
     class SnakeConnectionState : public ix::ConnectionState
     {
     public:
-        std::string getNonce() { return _nonce; }
+        std::string getNonce()
-        void setNonce(const std::string& nonce) { _nonce = nonce; }
+        {
+            return _nonce;
+        }
+        void setNonce(const std::string& nonce)
+        {
+            _nonce = nonce;
+        }
 
-        std::string appkey() { return _appkey; }
+        std::string appkey()
-        void setAppkey(const std::string& appkey) { _appkey = appkey; }
+        {
+            return _appkey;
+        }
+        void setAppkey(const std::string& appkey)
+        {
+            _appkey = appkey;
+        }
 
-        std::string role() { return _role; }
+        std::string role()
-        void setRole(const std::string& role) { _role = role; }
+        {
+            return _role;
+        }
+        void setRole(const std::string& role)
+        {
+            _role = role;
+        }
 
-        ix::RedisClient& redisClient() { return _redisClient; }
+        ix::RedisClient& redisClient()
+        {
+            return _redisClient;
+        }
 
         std::future<void> fut;
 
@@ -37,4 +57,4 @@ namespace snake
 
         ix::RedisClient _redisClient;
     };
-}
+} // namespace snake

ws/snake/IXSnakeProtocol.h

@@ -18,9 +18,8 @@ namespace snake
     class SnakeConnectionState;
     struct AppConfig;
 
-    void processCobraMessage(
+    void processCobraMessage(std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<SnakeConnectionState> state,
                              std::shared_ptr<ix::WebSocket> ws,
                              const AppConfig& appConfig,
                              const std::string& str);
-}
+} // namespace snake

ws/snake/IXSnakeServer.h

@@ -6,10 +6,9 @@
 
 #pragma once
 
-#include <string>
-
-#include <ixwebsocket/IXWebSocketServer.h>
 #include "IXAppConfig.h"
+#include <ixwebsocket/IXWebSocketServer.h>
+#include <string>
 
 namespace snake
 {
@@ -27,4 +26,4 @@ namespace snake
         AppConfig _appConfig;
         ix::WebSocketServer _server;
     };
-}
+} // namespace snake

ws/ws.h

@@ -28,17 +28,13 @@ namespace ix
     int ws_broadcast_server_main(int port, const std::string& hostname);
     int ws_transfer_main(int port, const std::string& hostname);
 
-    int ws_chat_main(const std::string& url,
+    int ws_chat_main(const std::string& url, const std::string& user);
-                     const std::string& user);
 
     int ws_connect_main(const std::string& url, bool disableAutomaticReconnection);
 
-    int ws_receive_main(const std::string& url,
+    int ws_receive_main(const std::string& url, bool enablePerMessageDeflate, int delayMs);
-                        bool enablePerMessageDeflate,
-                        int delayMs);
 
-    int ws_send_main(const std::string& url,
+    int ws_send_main(const std::string& url, const std::string& path);
-                     const std::string& path);
 
     int ws_redis_publish_main(const std::string& hostname,
                               int port,
@@ -95,4 +91,4 @@ namespace ix
                       const std::string& redisPassword,
                       bool verbose,
                       const std::string& appsConfigPath);
-}
+} // namespace ix