opal-up 0.0.4 → 0.0.5

data/ext/up_ext/WebSocketContextData.h

@@ -18,92 +18,104 @@
 #ifndef UWS_WEBSOCKETCONTEXTDATA_H
 #define UWS_WEBSOCKETCONTEXTDATA_H
 
-#include "Loop.h"
 #include "AsyncSocket.h"
+#include "Loop.h"
 
 #include "MoveOnlyFunction.h"
 #include <string_view>
 #include <vector>
 
-#include "WebSocketProtocol.h"
 #include "TopicTree.h"
 #include "WebSocketData.h"
+#include "WebSocketProtocol.h"
 
 namespace uWS {
 
 /* Type queued up when publishing */
 struct TopicTreeMessage {
-    std::string message;
-    /*OpCode*/ int opCode;
-    bool compress;
+  std::string message;
+  /*OpCode*/ int opCode;
+  bool compress;
 };
 struct TopicTreeBigMessage {
-    std::string_view message;
-    /*OpCode*/ int opCode;
-    bool compress;
+  std::string_view message;
+  /*OpCode*/ int opCode;
+  bool compress;
 };
 
 template <bool, bool, typename> struct WebSocket;
 
-/* todo: this looks identical to WebSocketBehavior, why not just std::move that entire thing in? */
+/* todo: this looks identical to WebSocketBehavior, why not just std::move that
+ * entire thing in? */
 
-template <bool SSL, typename USERDATA>
-struct WebSocketContextData {
+template <bool SSL, typename USERDATA> struct WebSocketContextData {
 private:
-
 public:
-
-    /* This one points to the App's shared topicTree */
-    TopicTree<TopicTreeMessage, TopicTreeBigMessage> *topicTree;
-
-    /* The callbacks for this context */
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *)> openHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view, OpCode)> messageHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view, OpCode)> droppedHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *)> drainHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view, int, int)> subscriptionHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, int, std::string_view)> closeHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view)> pingHandler = nullptr;
-    MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view)> pongHandler = nullptr;
-
-    /* Settings for this context */
-    size_t maxPayloadLength = 0;
-
-    /* We do need these for async upgrade */
-    CompressOptions compression;
-
-    /* There needs to be a maxBackpressure which will force close everything over that limit */
-    size_t maxBackpressure = 0;
-    bool closeOnBackpressureLimit;
-    bool resetIdleTimeoutOnSend;
-    bool sendPingsAutomatically;
-    unsigned short maxLifetime;
-
-    /* These are calculated on creation */
-    std::pair<unsigned short, unsigned short> idleTimeoutComponents;
-
-    /* This is run once on start-up */
-    void calculateIdleTimeoutCompnents(unsigned short idleTimeout) {
-        unsigned short margin = 4;
-        /* 4, 8 or 16 seconds margin based on idleTimeout */
-        while ((int) idleTimeout - margin * 2 >= margin * 2 && margin < 16) {
-            margin = (unsigned short) (margin << 1);
-        }
-        idleTimeoutComponents = {
-            idleTimeout - (sendPingsAutomatically ? margin : 0), /* reduce normal idleTimeout if it is extended by ping-timeout */
-            margin /* ping-timeout - also used for end() timeout */
-        };
-    }
-
-    ~WebSocketContextData() {
-
-    }
-
-    WebSocketContextData(TopicTree<TopicTreeMessage, TopicTreeBigMessage> *topicTree) : topicTree(topicTree) {
-
+  /* This one points to the App's shared topicTree */
+  TopicTree<TopicTreeMessage, TopicTreeBigMessage> *topicTree;
+
+  /* The callbacks for this context */
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *)> openHandler =
+      nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view,
+                        OpCode)>
+      messageHandler = nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view,
+                        OpCode)>
+      droppedHandler = nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *)> drainHandler =
+      nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view, int,
+                        int)>
+      subscriptionHandler = nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, int,
+                        std::string_view)>
+      closeHandler = nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view)>
+      pingHandler = nullptr;
+  MoveOnlyFunction<void(WebSocket<SSL, true, USERDATA> *, std::string_view)>
+      pongHandler = nullptr;
+
+  /* Settings for this context */
+  size_t maxPayloadLength = 0;
+
+  /* We do need these for async upgrade */
+  CompressOptions compression;
+
+  /* There needs to be a maxBackpressure which will force close everything over
+   * that limit */
+  size_t maxBackpressure = 0;
+  bool closeOnBackpressureLimit;
+  bool resetIdleTimeoutOnSend;
+  bool sendPingsAutomatically;
+  unsigned short maxLifetime;
+
+  /* These are calculated on creation */
+  std::pair<unsigned short, unsigned short> idleTimeoutComponents;
+
+  /* This is run once on start-up */
+  void calculateIdleTimeoutCompnents(unsigned short idleTimeout) {
+    unsigned short margin = 4;
+    /* 4, 8 or 16 seconds margin based on idleTimeout */
+    while ((int)idleTimeout - margin * 2 >= margin * 2 && margin < 16) {
+      margin = (unsigned short)(margin << 1);
     }
+    idleTimeoutComponents = {
+        idleTimeout - (sendPingsAutomatically
+                           ? margin
+                           : 0), /* reduce normal idleTimeout if it is extended
+                                    by ping-timeout */
+        margin /* ping-timeout - also used for end() timeout */
+    };
+  }
+
+  ~WebSocketContextData() {}
+
+  WebSocketContextData(
+      TopicTree<TopicTreeMessage, TopicTreeBigMessage> *topicTree)
+      : topicTree(topicTree) {}
 };
 
-}
+} // namespace uWS
 
 #endif // UWS_WEBSOCKETCONTEXTDATA_H

data/ext/up_ext/WebSocketData.h

@@ -18,69 +18,76 @@
 #ifndef UWS_WEBSOCKETDATA_H
 #define UWS_WEBSOCKETDATA_H
 
-#include "WebSocketProtocol.h"
 #include "AsyncSocketData.h"
 #include "PerMessageDeflate.h"
 #include "TopicTree.h"
+#include "WebSocketProtocol.h"
 
 #include <string>
 
 namespace uWS {
 
 struct WebSocketData : AsyncSocketData<false>, WebSocketState<true> {
-    /* This guy has a lot of friends - why? */
-    template <bool, bool, typename> friend struct WebSocketContext;
-    template <bool, typename> friend struct WebSocketContextData;
-    template <bool, bool, typename> friend struct WebSocket;
-    template <bool> friend struct HttpContext;
+  /* This guy has a lot of friends - why? */
+  template <bool, bool, typename> friend struct WebSocketContext;
+  template <bool, typename> friend struct WebSocketContextData;
+  template <bool, bool, typename> friend struct WebSocket;
+  template <bool> friend struct HttpContext;
+
 private:
-    std::string fragmentBuffer;
-    unsigned int controlTipLength = 0;
-    bool isShuttingDown = 0;
-    bool hasTimedOut = false;
-    enum CompressionStatus : char {
-        DISABLED,
-        ENABLED,
-        COMPRESSED_FRAME
-    } compressionStatus;
-
-    /* We might have a dedicated compressor */
-    DeflationStream *deflationStream = nullptr;
-    /* And / or a dedicated decompressor */
-    InflationStream *inflationStream = nullptr;
-
-    /* We could be a subscriber */
-    Subscriber *subscriber = nullptr;
+  std::string fragmentBuffer;
+  unsigned int controlTipLength = 0;
+  bool isShuttingDown = 0;
+  bool hasTimedOut = false;
+  enum CompressionStatus : char {
+    DISABLED,
+    ENABLED,
+    COMPRESSED_FRAME
+  } compressionStatus;
+
+  /* We might have a dedicated compressor */
+  DeflationStream *deflationStream = nullptr;
+  /* And / or a dedicated decompressor */
+  InflationStream *inflationStream = nullptr;
+
+  /* We could be a subscriber */
+  Subscriber *subscriber = nullptr;
+
 public:
-    WebSocketData(bool perMessageDeflate, CompressOptions compressOptions, BackPressure &&backpressure) : AsyncSocketData<false>(std::move(backpressure)), WebSocketState<true>() {
-        compressionStatus = perMessageDeflate ? ENABLED : DISABLED;
-
-        /* Initialize the dedicated sliding window(s) */
-        if (perMessageDeflate) {
-            if ((compressOptions & CompressOptions::_COMPRESSOR_MASK) != CompressOptions::SHARED_COMPRESSOR) {
-                deflationStream = new DeflationStream(compressOptions);
-            }
-            if ((compressOptions & CompressOptions::_DECOMPRESSOR_MASK) != CompressOptions::SHARED_DECOMPRESSOR) {
-                inflationStream = new InflationStream(compressOptions);
-            }
-        }
+  WebSocketData(bool perMessageDeflate, CompressOptions compressOptions,
+                BackPressure &&backpressure)
+      : AsyncSocketData<false>(std::move(backpressure)),
+        WebSocketState<true>() {
+    compressionStatus = perMessageDeflate ? ENABLED : DISABLED;
+
+    /* Initialize the dedicated sliding window(s) */
+    if (perMessageDeflate) {
+      if ((compressOptions & CompressOptions::_COMPRESSOR_MASK) !=
+          CompressOptions::SHARED_COMPRESSOR) {
+        deflationStream = new DeflationStream(compressOptions);
+      }
+      if ((compressOptions & CompressOptions::_DECOMPRESSOR_MASK) !=
+          CompressOptions::SHARED_DECOMPRESSOR) {
+        inflationStream = new InflationStream(compressOptions);
+      }
     }
+  }
 
-    ~WebSocketData() {
-        if (deflationStream) {
-            delete deflationStream;
-        }
+  ~WebSocketData() {
+    if (deflationStream) {
+      delete deflationStream;
+    }
 
-        if (inflationStream) {
-            delete inflationStream;
-        }
+    if (inflationStream) {
+      delete inflationStream;
+    }
 
-        if (subscriber) {
-            delete subscriber;
-        }
+    if (subscriber) {
+      delete subscriber;
     }
+  }
 };
 
-}
+} // namespace uWS
 
 #endif // UWS_WEBSOCKETDATA_H