add limit to how many messages can be queued for each web socket client

me-no-dev · me-no-dev · commit bed4146ec647 · 2018-08-18T21:10:39.000+02:00
diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp
@@ -551,7 +551,12 @@ void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){
     delete dataMessage;
     return;
   }
-  _messageQueue.add(dataMessage);
+  if(_messageQueue.length() > WS_MAX_QUEUED_MESSAGES){
+      ets_printf("ERROR: Too many messages queued\n");
+      delete dataMessage;
+  } else {
+      _messageQueue.add(dataMessage);
+  }
   if(_client->canSend())
     _runQueue();
 }
diff --git a/src/AsyncWebSocket.h b/src/AsyncWebSocket.h
@@ -24,8 +24,10 @@
 #include <Arduino.h>
 #ifdef ESP32
 #include <AsyncTCP.h>
+#define WS_MAX_QUEUED_MESSAGES 32
 #else
 #include <ESPAsyncTCP.h>
+#define WS_MAX_QUEUED_MESSAGES 8
 #endif
 #include <ESPAsyncWebServer.h>
 

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,12 @@ void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){`
`551`	`551`	`delete dataMessage;`
`552`	`552`	`return;`
`553`	`553`	`}`
`554`		`- _messageQueue.add(dataMessage);`
	`554`	`+ if(_messageQueue.length() > WS_MAX_QUEUED_MESSAGES){`
	`555`	`+ ets_printf("ERROR: Too many messages queued\n");`
	`556`	`+ delete dataMessage;`
	`557`	`+ } else {`
	`558`	`+ _messageQueue.add(dataMessage);`
	`559`	`+ }`
`555`	`560`	`if(_client->canSend())`
`556`	`561`	`_runQueue();`
`557`	`562`	`}`