Manually merged changes from BlueAndy fork

Minor updates of my custom stuff

Author: lorol

examples/ESP_AsyncFSBrowser/data/acefull.js.gz

@@ -672,11 +672,23 @@ void setup(){
 #ifdef USE_AUTH_STAT
     if(!request->authenticate(http_username, http_password)) return request->requestAuthentication();
 #endif
-      request->onDisconnect([]() {
-        WiFi.disconnect(true);  
+      request->onDisconnect([]() { 
 #ifdef ESP32
+/*          
+        //https://github.com/espressif/arduino-esp32/issues/400#issuecomment-499631249 
+        //WiFi.disconnect(true); // doesn't work on esp32, below needs #include "esp_wifi.h"
+        wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); //load the flash-saved configs
+        esp_wifi_init(&cfg); //initiate and allocate wifi resources (does not matter if connection fails)
+        if(esp_wifi_restore()!=ESP_OK){
+            Serial.print(F("WiFi is not initialized by esp_wifi_init "));
+        } else {
+            Serial.print(F("WiFi Configurations Cleared!"));
+        }
+*/        
+        WiFi.disconnect(true, true); // Works on esp32
         ESP.restart();
 #elif defined(ESP8266)
+        WiFi.disconnect(true); 
         ESP.reset();
 #endif
       });

examples/ESP_AsyncFSBrowser/data/worker-css.js.gz

@@ -664,9 +664,9 @@ void AsyncWebSocketClient::_onData(void *pbuf, size_t plen){
         if(_pinfo.opcode){
           _pinfo.message_opcode = _pinfo.opcode;
           _pinfo.num = 0;
-        } else _pinfo.num += 1;
+        }
       }
-      _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, (uint8_t*)data, datalen);
+      if (datalen > 0) _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, (uint8_t*)data, datalen);
 
       _pinfo.index += datalen;
     } else if((datalen + _pinfo.index) == _pinfo.len){
@@ -694,6 +694,8 @@ void AsyncWebSocketClient::_onData(void *pbuf, size_t plen){
           _server->_handleEvent(this, WS_EVT_PONG, NULL, data, datalen);
       } else if(_pinfo.opcode < 8){//continuation or text/binary frame
         _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, data, datalen);
+        if (_pinfo.final) _pinfo.num = 0;
+        else _pinfo.num += 1;   
       }
     } else {
       //os_printf("frame error: len: %u, index: %llu, total: %llu\n", datalen, _pinfo.index, _pinfo.len);