Fix webUI loose websocket connection on long upload / download (>30MB)

Add benchmark code for download
Replace Download size packet from 1024 to 2048 on ESP32
Bump version

Author: luc-github

esp3d/src/include/version.h

@@ -22,7 +22,7 @@
 #define _VERSION_ESP3D_H
 
 //version and sources location
-#define FW_VERSION "3.0.0.a214"
+#define FW_VERSION "3.0.0.a215"
 #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
 
 #endif //_VERSION_ESP3D_H

esp3d/src/modules/http/handles/upload-SD-files.cpp

@@ -35,6 +35,7 @@
 #if defined(ESP3DLIB_ENV) && COMMUNICATION_PROTOCOL == SOCKET_SERIAL
 #include "../../serial2socket/serial2socket.h"
 #endif // ESP3DLIB_ENV && COMMUNICATION_PROTOCOL == SOCKET_SERIAL
+#include "../../websocket/websocket_server.h"
 
 //SD files uploader handle
 void HTTP_Server::SDFileupload ()
@@ -43,6 +44,7 @@ void HTTP_Server::SDFileupload ()
     static uint64_t bench_start;
     static size_t bench_transfered;
 #endif//ESP_BENCHMARK_FEATURE
+    static uint64_t last_WS_update;
     //get authentication status
     level_authenticate_type auth_level= AuthenticationService::authenticated_level();
     static String filename;
@@ -60,6 +62,7 @@ void HTTP_Server::SDFileupload ()
 #endif // ESP3DLIB_ENV && COMMUNICATION_PROTOCOL == SOCKET_SERIAL
             //Upload start
             if (upload.status == UPLOAD_FILE_START) {
+                last_WS_update = millis();
 #ifdef ESP_BENCHMARK_FEATURE
                 bench_start = millis();
                 bench_transfered = 0;
@@ -167,6 +170,11 @@ void HTTP_Server::SDFileupload ()
 #ifdef ESP_BENCHMARK_FEATURE
                     bench_transfered += upload.currentSize;
 #endif//ESP_BENCHMARK_FEATURE
+                    //update websocket every 2000 ms
+                    if (millis()-last_WS_update > 2000) {
+                        websocket_terminal_server.handle();
+                        last_WS_update = millis();
+                    }
                     //no error so write post date
                     int writeddatanb=fsUploadFile.write(upload.buf, upload.currentSize);
                     if(upload.currentSize != (size_t)writeddatanb) {

esp3d/src/modules/http/http_server.cpp

@@ -24,9 +24,11 @@
 #if defined (HTTP_FEATURE)
 #if defined (ARDUINO_ARCH_ESP32)
 #include <WebServer.h>
+#define DOWNLOAD_PACKET_SIZE 2048
 #endif //ARDUINO_ARCH_ESP32
 #if defined (ARDUINO_ARCH_ESP8266)
 #include <ESP8266WebServer.h>
+#define DOWNLOAD_PACKET_SIZE 1024
 #endif //ARDUINO_ARCH_ESP8266
 #include "http_server.h"
 #include "../authentication/authentication_service.h"
@@ -36,8 +38,11 @@
 #include "../websocket/websocket_server.h"
 #if defined(SD_DEVICE)
 #include "../filesystem/esp_sd.h"
-
 #endif //SD_DEVICE
+#ifdef ESP_BENCHMARK_FEATURE
+#include "../../core/benchmark.h"
+#endif //ESP_BENCHMARK_FEATURE
+
 bool HTTP_Server::_started = false;
 uint16_t HTTP_Server::_port = 0;
 WEBSERVER * HTTP_Server::_webserver = nullptr;
@@ -91,6 +96,7 @@ void HTTP_Server::init_handlers()
 bool HTTP_Server::StreamFSFile(const char* filename, const char * contentType)
 {
     ESP_File datafile = ESP_FileSystem::open(filename);
+    uint64_t last_WS_update = millis();
     if (!datafile) {
         return false;
     }
@@ -99,10 +105,10 @@ bool HTTP_Server::StreamFSFile(const char* filename, const char * contentType)
     bool done = false;
     _webserver->setContentLength(totalFileSize);
     _webserver->send(200, contentType, "");
-    uint8_t buf[1024];
+    uint8_t buf[DOWNLOAD_PACKET_SIZE];
     while (!done && _webserver->client().connected()) {
         Hal::wait(0);
-        int v = datafile.read(buf,1024);
+        int v = datafile.read(buf,DOWNLOAD_PACKET_SIZE);
         if ((v == -1) ||  (v == 0)) {
             done = true;
         } else {
@@ -112,6 +118,11 @@ bool HTTP_Server::StreamFSFile(const char* filename, const char * contentType)
         if (i >= totalFileSize) {
             done = true;
         }
+        //update websocket every 2000 ms
+        if (millis()-last_WS_update > 2000) {
+            websocket_terminal_server.handle();
+            last_WS_update = millis();
+        }
     }
     datafile.close();
     if ( i != totalFileSize) {
@@ -124,6 +135,11 @@ bool HTTP_Server::StreamFSFile(const char* filename, const char * contentType)
 bool HTTP_Server::StreamSDFile(const char* filename, const char * contentType)
 {
     ESP_SDFile datafile = ESP_SD::open(filename);
+    uint64_t last_WS_update = millis();
+#ifdef ESP_BENCHMARK_FEATURE
+    uint64_t bench_start = millis();
+    size_t bench_transfered = 0;
+#endif//ESP_BENCHMARK_FEATURE
     if (!datafile) {
         return false;
     }
@@ -132,24 +148,36 @@ bool HTTP_Server::StreamSDFile(const char* filename, const char * contentType)
     bool done = false;
     _webserver->setContentLength(totalFileSize);
     _webserver->send(200, contentType, "");
-    uint8_t buf[1024];
+    uint8_t buf[DOWNLOAD_PACKET_SIZE];
     while (!done && _webserver->client().connected()) {
         Hal::wait(0);
-        int v = datafile.read(buf,1024);
+        int v = datafile.read(buf,DOWNLOAD_PACKET_SIZE);
         if ((v == -1) ||  (v == 0)) {
             done = true;
         } else {
             _webserver->client().write(buf,v);
             i+=v;
+#ifdef ESP_BENCHMARK_FEATURE
+            bench_transfered += v;
+#endif//ESP_BENCHMARK_FEATURE
         }
         if (i >= totalFileSize) {
             done = true;
         }
+
+        //update websocket every 2000 ms
+        if (millis()-last_WS_update > 2000) {
+            websocket_terminal_server.handle();
+            last_WS_update = millis();
+        }
     }
     datafile.close();
     if ( i != totalFileSize) {
         return false;
     }
+#ifdef ESP_BENCHMARK_FEATURE
+    benchMark("SD download", bench_start, millis(), bench_transfered);
+#endif//ESP_BENCHMARK_FEATURE
     return true;
 }
 #endif //SD_DEVICE