Added method to access clients of AsyncWebSocket (me-no-dev#583)

sascha432 · me-no-dev · commit 403752a942f7 · 2019-10-02T14:16:43.000+03:00
* Added method to access clients of AsyncWebSocket * me-no-dev#571 * Conflict with crypto library
diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp
@@ -1236,6 +1236,9 @@ void AsyncWebSocket::_cleanBuffers()
   }
 }
 
+AsyncWebSocket::AsyncWebSocketClientLinkedList AsyncWebSocket::getClients() const {
+  return _clients;
+}
 
 /*
  * Response to Web Socket request - sends the authorization and detaches the TCP Client from the web server
diff --git a/src/AsyncWebSocket.h b/src/AsyncWebSocket.h
@@ -35,6 +35,9 @@
 
 #ifdef ESP8266
 #include <Hash.h>
+#ifdef CRYPTO_HASH_h // include Hash.h from espressif framework if the first include was from the crypto library
+#include <../src/Hash.h>
+#endif
 #endif
 
 #ifdef ESP32
@@ -238,9 +241,11 @@ typedef std::function<void(AsyncWebSocket * server, AsyncWebSocketClient * clien
 
 //WebServer Handler implementation that plays the role of a socket server
 class AsyncWebSocket: public AsyncWebHandler {
+  public:
+    typedef LinkedList<AsyncWebSocketClient *> AsyncWebSocketClientLinkedList;
   private:
     String _url;
-    LinkedList<AsyncWebSocketClient *> _clients;
+    AsyncWebSocketClientLinkedList _clients;
     uint32_t _cNextId;
     AwsEventHandler _eventHandler;
     bool _enabled;
@@ -325,6 +330,8 @@ class AsyncWebSocket: public AsyncWebHandler {
     AsyncWebSocketMessageBuffer * makeBuffer(uint8_t * data, size_t size); 
     LinkedList<AsyncWebSocketMessageBuffer *> _buffers;
     void _cleanBuffers(); 
+
+    AsyncWebSocketClientLinkedList getClients() const;
 };
 
 //WebServer response to authenticate the socket and detach the tcp client from the web server request
diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp
@@ -446,6 +446,7 @@ size_t AsyncAbstractResponse::_fillBufferAndProcessTemplates(uint8_t* data, size
         _cache.insert(_cache.begin(), &data[originalLen - (pTemplateStart + numBytesCopied - pTemplateEnd - 1)], &data[len]);
         //2. parameter value is longer than placeholder text, push the data after placeholder which not saved into cache further to the end
         memmove(pTemplateStart + numBytesCopied, pTemplateEnd + 1, &data[originalLen] - pTemplateStart - numBytesCopied);
+        len = originalLen; // fix issue with truncated data, not sure if it has any side effects
       } else if(pTemplateEnd + 1 != pTemplateStart + numBytesCopied)
         //2. Either parameter value is shorter than placeholder text OR there is enough free space in buffer to fit.
         //   Move the entire data after the placeholder

Original file line number	Diff line number	Diff line change
`@@ -1236,6 +1236,9 @@ void AsyncWebSocket::_cleanBuffers()`
`1236`	`1236`	`}`
`1237`	`1237`	`}`
`1238`	`1238`
	`1239`	`+AsyncWebSocket::AsyncWebSocketClientLinkedList AsyncWebSocket::getClients() const {`
	`1240`	`+ return _clients;`
	`1241`	`+}`
`1239`	`1242`
`1240`	`1243`	`/*`
`1241`	`1244`	`* Response to Web Socket request - sends the authorization and detaches the TCP Client from the web server`