sendPrepared should return SendStatus

Author: uNetworkingAB

src/Loop.h

@@ -126,15 +126,17 @@ struct Loop {
 
         LoopData *loopData = (LoopData *) us_loop_ext((us_loop_t *) this);
 
-        /* Initialize loop's deflate inflate streams */
-        if (!loopData->zlibContext) {
-            loopData->zlibContext = new ZlibContext;
-            loopData->inflationStream = new InflationStream(CompressOptions::DEDICATED_DECOMPRESSOR);
-            loopData->deflationStream = new DeflationStream(CompressOptions::DEDICATED_COMPRESSOR);
+        if (compress) {
+            /* Initialize loop's deflate inflate streams */
+            if (!loopData->zlibContext) {
+                loopData->zlibContext = new ZlibContext;
+                loopData->inflationStream = new InflationStream(CompressOptions::DEDICATED_DECOMPRESSOR);
+                loopData->deflationStream = new DeflationStream(CompressOptions::DEDICATED_COMPRESSOR);
+            }
+
+            preparedMessage.compressedMessage = loopData->deflationStream->deflate(loopData->zlibContext, {preparedMessage.originalMessage.data(), preparedMessage.originalMessage.length()}, true);
         }
 
-        preparedMessage.compressedMessage = loopData->deflationStream->deflate(loopData->zlibContext, {preparedMessage.originalMessage.data(), preparedMessage.originalMessage.length()}, true);
-        
         return preparedMessage;
     }
 

src/TopicTree.h

@@ -202,7 +202,7 @@ struct TopicTree {
         /* Remove us from topic */
         topicPtr->erase(s);
 
-        int newCount = topicPtr->size();
+        int newCount = (int) topicPtr->size();
 
         /* If there is no subscriber to this topic, remove it */
         if (!topicPtr->size()) {

src/WebSocket.h

@@ -101,12 +101,11 @@ struct WebSocket : AsyncSocket<SSL> {
     }
 
     /* Experimental */
-    void sendPrepared(PreparedMessage &preparedMessage) {
-        if (hasNegotiatedCompression() && preparedMessage.compressedMessage.length() < preparedMessage.originalMessage.length()) {
-            send({preparedMessage.compressedMessage.data(), preparedMessage.compressedMessage.length()}, (OpCode) preparedMessage.opCode, uWS::CompressFlags::ALREADY_COMPRESSED);
-        } else {
-            send({preparedMessage.originalMessage.data(), preparedMessage.originalMessage.length()}, (OpCode) preparedMessage.opCode);
+    SendStatus sendPrepared(PreparedMessage &preparedMessage) {
+        if (preparedMessage.compressed && hasNegotiatedCompression() && preparedMessage.compressedMessage.length() < preparedMessage.originalMessage.length()) {
+            return send({preparedMessage.compressedMessage.data(), preparedMessage.compressedMessage.length()}, (OpCode) preparedMessage.opCode, uWS::CompressFlags::ALREADY_COMPRESSED);
         }
+        return send({preparedMessage.originalMessage.data(), preparedMessage.originalMessage.length()}, (OpCode) preparedMessage.opCode);
     }
 
     /* Send or buffer a WebSocket frame, compressed or not. Returns BACKPRESSURE on increased user space backpressure,