Merge pull request #93 from ayushsharma82/dev

fix: dependencies and onMessage callback

.github/workflows/ci.yml

@@ -58,13 +58,13 @@ jobs:
         run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
 
       - name: Install AsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.4
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.3
 
       - name: Install ESPAsyncTCP
         run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
 
       - name: Install ESPAsyncWebServer
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.0.6
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.1.1
 
       - name: Build Demo
         run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/Demo/Demo.ino"
@@ -96,7 +96,7 @@ jobs:
           - name: esp32dev|arduino-3
             board: esp32dev
             platform: espressif32
-            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'"
+            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
           - name: esp32-s3-devkitc-1|arduino
             board: esp32-s3-devkitc-1
             platform: espressif32
@@ -108,7 +108,7 @@ jobs:
           - name: esp32-s3-devkitc-1|arduino-3
             board: esp32-s3-devkitc-1
             platform: espressif32
-            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'"
+            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
           - name: huzzah|espressif8266
             board: huzzah
             platform: espressif8266

library.json

@@ -15,14 +15,14 @@
       "maintainer": true
     }
   ],
-  "version": "2.0.4",
+  "version": "2.0.6",
   "frameworks": "arduino",
   "platforms": ["espressif8266", "espressif32"],
   "dependencies": [
     {
       "owner": "mathieucarbou",
-      "name": "ESP Async WebServer",
-      "version": "^3.0.6",
+      "name": "ESPAsyncWebServer",
+      "version": "^3.1.1",
       "platforms": ["espressif8266", "espressif32"]
     }
   ]

library.properties

@@ -1,5 +1,5 @@
 name=WebSerial
-version=2.0.4
+version=2.0.6
 author=Ayush Sharma
 category=Communication
 maintainer=Ayush Sharma <asrocks5@gmail.com>

platformio.ini

@@ -9,8 +9,8 @@ build_flags =
   -D WS_MAX_QUEUED_MESSAGES=128
   -D WSL_HIGH_PERF
 lib_deps = 
-  mathieucarbou/Async TCP @ ^3.1.4
-  mathieucarbou/ESP Async WebServer @ 3.0.6
+  mathieucarbou/AsyncTCP@^3.2.3
+  mathieucarbou/ESPAsyncWebServer@^3.1.1
 upload_protocol = esptool
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder, log2file
@@ -33,8 +33,8 @@ board = esp32-s3-devkitc-1
 [env:arduino-3]
 platform = espressif32
 platform_packages=
-  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2
-  platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip
+  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3
+  platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip
 board = esp32-s3-devkitc-1
 ; board = esp32dev
 
@@ -42,5 +42,5 @@ board = esp32-s3-devkitc-1
 platform = espressif8266
 board = huzzah
 lib_deps = 
-  mathieucarbou/ESP Async WebServer @ 3.0.6
-  esphome/ESPAsyncTCP-esphome @ 2.0.0
+  mathieucarbou/ESP Async WebServer@^3.1.1
+  esphome/ESPAsyncTCP-esphome@^2.0.0

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);
     }
   };
 }

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;