Merge pull request #92 from mathieucarbou/dev

Fix callback ref not kept when using WSLStringMessageHandler
ayushsharma82 · Jul 7, 2024 · d9af19b · d9af19b
2 parents 206109f + a0463ff
commit d9af19b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/WebSerial.cpp b/src/WebSerial.cpp
@@ -101,16 +101,13 @@ void WebSerialClass::onMessage(WSLMessageHandler recv) {
 }
 
 void WebSerialClass::onMessage(WSLStringMessageHandler callback) {
+  _recvString = callback;
   _recv = [&](uint8_t *data, size_t len) {
     if(data && len) {
-#ifdef ESP8266
       String msg;
       msg.reserve(len);
       msg.concat((char*)data, len);
-      callback(msg);
-#else
-      callback(String((char*)data, len));
-#endif
+      _recvString(msg);
     }
   };
 }

diff --git a/src/WebSerial.h b/src/WebSerial.h
@@ -119,6 +119,7 @@ class WebSerialClass : public Print {
     AsyncWebServer *_server;
     AsyncWebSocket *_ws;
     WSLMessageHandler _recv = nullptr;
+    WSLStringMessageHandler _recvString = nullptr;
     bool _authenticate = false;
     String _username;
     String _password;