Merge branch 'master' of https://github.com/cotestatnt/async-esp-fs-webserver

cotestatnt · cotestatnt · commit c53fee7c7435 · 2025-12-15T17:31:37.000+01:00
diff --git a/.github/workflows/cli-build-esp32-dev.yml b/.github/workflows/cli-build-esp32-dev.yml
@@ -6,7 +6,8 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - dev
+      - main
+      - release/*
       
   pull_request:
 
diff --git a/.github/workflows/esp-fs-webserver-dev.zip b/.github/workflows/esp-fs-webserver-dev.zip
diff --git a/.github/workflows/pio-build-esp32-dev.yml b/.github/workflows/pio-build-esp32-dev.yml
@@ -6,7 +6,8 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - dev
+      - master
+      - release/*
       
   pull_request:
 
diff --git a/.github/workflows/pio-build-esp8266.yml b/.github/workflows/pio-build-esp8266.yml
@@ -6,9 +6,9 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - dev
-      # - master
-      # - release/*
+      - master
+      - release/*
+      
   pull_request:
 
 concurrency:
diff --git a/examples/binaryWebSocket/binaryWebSocket.ino b/examples/binaryWebSocket/binaryWebSocket.ino
@@ -209,14 +209,6 @@ void setup() {
   // Enable ACE FS file web editor and add FS info callback function
   server.enableFsCodeEditor();
 
-#ifdef ESP32
-  server.setFsInfoCallback([](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();  
-  });
-#endif
-
   // Init with custom WebSocket event handler and start server
   server.init(onWsEvent);
 
diff --git a/examples/csvLogger/csvLogger.ino b/examples/csvLogger/csvLogger.ino
@@ -95,14 +95,7 @@ void setup() {
 
     // Enable ACE FS file web editor and add FS info callback fucntion
     server.enableFsCodeEditor();
-    #ifdef ESP32
-    server.setFsInfoCallback([](fsInfo_t* fsInfo) {
-        fsInfo->totalBytes = LittleFS.totalBytes();
-        fsInfo->usedBytes = LittleFS.usedBytes();
-        fsInfo->fsName = "LittleFS";
-    });
-    #endif
-
+    
     // Start server
     server.init();
     Serial.print(F("Async ESP Web Server started on IP Address: "));
diff --git a/examples/csvLoggerSD/csvLoggerSD.ino b/examples/csvLoggerSD/csvLoggerSD.ino
@@ -117,13 +117,6 @@ void setup() {
 
   // Enable ACE FS file web editor and add FS info callback fucntion
   server.enableFsCodeEditor();
-  #ifdef ESP32
-  server.setFsInfoCallback([](fsInfo_t* fsInfo) {
-      fsInfo->totalBytes = SD.totalBytes();
-      fsInfo->usedBytes = SD.usedBytes();
-      fsInfo->fsName = "SD";
-  });
-  #endif
 
   // Start server
   server.init();
diff --git a/examples/customHTML/customHTML.ino b/examples/customHTML/customHTML.ino
@@ -78,18 +78,6 @@ bool startFilesystem() {
   return false;
 }
 
-/*
-* Getting FS info (total and free bytes) is strictly related to
-* filesystem library used (LittleFS, FFat, SPIFFS etc etc) and ESP framework
-*/
-#ifdef ESP32
-void getFsInfo(fsInfo_t* fsInfo) {
-	fsInfo->fsName = "LittleFS";
-	fsInfo->totalBytes = LittleFS.totalBytes();
-	fsInfo->usedBytes = LittleFS.usedBytes();
-}
-#endif
-
 
 ////////////////////  Load application options from filesystem  ////////////////////
 bool loadOptions() {
@@ -196,11 +184,7 @@ void setup() {
   server.setLogoBase64(base64_logo, "128", "128", /*overwrite file*/ false);
 
   // Enable ACE FS file web editor and add FS info callback function    
-#ifdef ESP32
-  server.enableFsCodeEditor(getFsInfo);
-#else
   server.enableFsCodeEditor();
-#endif
 
   // Inform user when config.json is saved via /edit or /upload
   server.setConfigSavedCallback(onConfigSaved);
diff --git a/examples/customOptions/customOptions.ino b/examples/customOptions/customOptions.ino
@@ -163,16 +163,7 @@ void setup() {
   server.addJavascript(reload_btn_script, "js", /*overwrite*/ false);
 
   // Enable ACE FS file web editor and add FS info callback function    
-#ifdef ESP32
-  server.enableFsCodeEditor([](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();
-  });
-#else
-  // ESP8266 core support LittleFS by default
   server.enableFsCodeEditor();
-#endif
 
   // set /setup and /edit page authentication
   server.setAuthentication("admin", "admin");
diff --git a/examples/esp32-cam/esp32-cam.ino b/examples/esp32-cam/esp32-cam.ino
@@ -78,10 +78,6 @@ void setup() {
 
   // Enable ACE FS file web editor and add FS info callback function
   server.enableFsCodeEditor();
-  server.setFsInfoCallback([](fsInfo_t* fsInfo) {
-    fsInfo->totalBytes = SD_MMC.totalBytes();
-    fsInfo->usedBytes = SD_MMC.usedBytes();
-  });
 
   // Add custom handlers to webserver
   server.on("/getPicture", getPicture);
diff --git a/examples/gpio_list/gpio_list.ino b/examples/gpio_list/gpio_list.ino
@@ -121,8 +121,7 @@ void updateGpioList(AsyncWebServerRequest *request) {
   bool first = true;
   for (gpio_type &gpio : gpios) {
     if (!first) json += ",";
-    first = false;
-    
+    first = false;    
     json += "{\"type\":\"";
     json += gpio.type;
     json += "\",\"pin\":";
@@ -178,18 +177,6 @@ void setup() {
   // Enable ACE FS file web editor and add FS info callback function
   server.enableFsCodeEditor();
 
-  /*
-  * Getting FS info (total and free bytes) is strictly related to
-  * filesystem library used (LittleFS, FFat, SPIFFS etc etc) and ESP framework
-  */
-  #ifdef ESP32
-  server.setFsInfoCallback([](fsInfo_t* fsInfo) {
-	  fsInfo->fsName = "LittleFS";
-	  fsInfo->totalBytes = LittleFS.totalBytes();
-	  fsInfo->usedBytes = LittleFS.usedBytes();  
-  });
-  #endif
-
   // Add custom page handlers
   server.on("/getGpioList", HTTP_GET, updateGpioList);
 
diff --git a/examples/handleFormData/handleFormData.ino b/examples/handleFormData/handleFormData.ino
@@ -102,19 +102,7 @@ void setup(){
 
   // Enable ACE FS file web editor and add FS info callback function
   server.enableFsCodeEditor();
-  /*
-  * Getting FS info (total and free bytes) is strictly related to
-  * filesystem library used (LittleFS, FFat, SPIFFS etc etc) and ESP framework
-  * (On ESP8266 will be used "built-in" fsInfo data type)
-  */
-  #ifdef ESP32
-  server.setFsInfoCallback( [](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();  
-  });
-  #endif
-
+ 
   // Start server
   server.init();
   Serial.print(F("ESP Web Server started on IP Address: "));
diff --git a/examples/highcharts/highcharts.ino b/examples/highcharts/highcharts.ino
@@ -1,8 +1,4 @@
-#if defined(ESP8266)
-#include <ESP8266mDNS.h>
-#elif defined(ESP32)
-#include <ESPmDNS.h>
-#endif
+#include <Arduino.h>
 #include <FS.h>
 #include <LittleFS.h>
 #include <AsyncFsWebServer.h>   // https://github.com/cotestatnt/async-esp-fs-webserver/
@@ -56,37 +52,9 @@ void getUpdatedtime(const uint32_t timeout)
 
 
 ////////////////////////////////  Filesystem  /////////////////////////////////////////
-void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
-  Serial.printf("\nListing directory: %s\n", dirname);
-  File root = fs.open(dirname, "r");
-  if (!root) {
-    Serial.println("- failed to open directory");
-    return;
-  }
-  if (!root.isDirectory()) {
-    Serial.println(" - not a directory");
-    return;
-  }
-  File file = root.openNextFile();
-  while (file) {
-    if (file.isDirectory()) {
-      if (levels) {
-        #ifdef ESP32
-          listDir(fs, file.path(), levels - 1);
-        #elif defined(ESP8266)
-          listDir(fs, file.fullName(), levels - 1);
-        #endif
-      }
-    } else {
-      Serial.printf("|__ FILE: %s (%d bytes)\n",file.name(), file.size());
-    }
-    file = root.openNextFile();
-  }
-}
-
 bool startFilesystem() {
   if (FILESYSTEM.begin()){
-    listDir(FILESYSTEM, "/", 1);
+    server.printFileList(FILESYSTEM, "/", 2), Serial;
     return true;
   }
   else {
@@ -115,18 +83,6 @@ void setup() {
   // Enable ACE FS file web editor and add FS info callback function
   server.enableFsCodeEditor();
 
-  /*
-  * Getting FS info (total and free bytes) is strictly related to
-  * filesystem library used (LittleFS, FFat, SPIFFS etc etc) and ESP framework
-  */
-  #ifdef ESP32
-  server.setFsInfoCallback([](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();  
-  });
-  #endif
-
   // Start server with custom websocket event handler
   server.init(onWsEvent);
   Serial.print(F("ESP Web Server started on IP Address: "));
@@ -137,32 +93,10 @@ void setup() {
     "Open /edit page to view, edit or upload example or your custom webserver source files."
   ));
 
-  // Start MDNS responder
-  if (WiFi.status() == WL_CONNECTED) {
-    // Set hostname
-#ifdef ESP8266
-    WiFi.hostname(hostname);
-#elif defined(ESP32)
-    WiFi.setHostname(hostname);
-#endif
-    if (MDNS.begin(hostname)) {
-      Serial.println(F("MDNS responder started."));
-      Serial.printf("You should be able to connect with address\t http://%s.local/\n", hostname);
-      // Add service to MDNS-SD
-      MDNS.addService("http", "tcp", 80);
-    }
-  }
 }
 
 
-void loop() {
-
-  if (WiFi.status() == WL_CONNECTED) {
-#ifdef ESP8266
-    MDNS.update();
-#endif
-  }
-
+void loop() {  
   // Send ESP system time (epoch) and heap stats to WS client
   static uint32_t sendToClientTime;
   if (millis() - sendToClientTime > 1000 ) {
diff --git a/examples/localRFID/webserver.hpp b/examples/localRFID/webserver.hpp
@@ -228,13 +228,6 @@ bool startWebServer(bool clear = false) {
 
   // Enable ACE FS file web editor and add FS info callback function
   myWebServer.enableFsCodeEditor();
-#if defined(ESP32)
-  myWebServer.setFsInfoCallback([](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();  
-  });
-#endif
 
   // Start the webserver
   myWebServer.init();
diff --git a/examples/mqtt_webserver/mqtt_webserver.ino b/examples/mqtt_webserver/mqtt_webserver.ino
@@ -35,12 +35,7 @@ char outTopic[24];
 ////////////////////////////////  Filesystem  /////////////////////////////////////////
 bool startFilesystem() {
   if (LittleFS.begin()) {
-    File root = LittleFS.open("/", "r");
-    File file = root.openNextFile();
-    while (file) {
-      Serial.printf("FS File: %s, size: %d\n", file.name(), file.size());
-      file = root.openNextFile();
-    }
+    myWebServer.printFileList(LittleFS, "/", 1, Serial);
     return true;
   } else {
     Serial.println("ERROR on mounting filesystem. It will be reformatted!");
@@ -103,11 +98,6 @@ void setup() {
 
   // Enable ACE FS file web editor and add FS info callback function
   myWebServer.enableFsCodeEditor();
-  myWebServer.setFsInfoCallback([](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();
-  });
 
   // Start webserver
   myWebServer.init();
@@ -119,8 +109,6 @@ void setup() {
     "Open /edit page to view, edit or upload example or your custom webserver source files."
   );
 
-  
-
   // Create a unique mqttClient ID and in/out topics
   snprintf(clientId, sizeof(clientId), "ESP-%llX", ESP.getEfuseMac());
   snprintf(inTopic, sizeof(inTopic), "%s/input", clientId);
@@ -162,5 +150,6 @@ void loop() {
     }
   }
 
-  delay(1);
+  // Nothing to do in main loop for Async Web Server
+  delay(10);
 }
diff --git a/examples/mysqlRFID/webserver_impl.h b/examples/mysqlRFID/webserver_impl.h
@@ -297,13 +297,6 @@ bool startWebServer(bool clear = false) {
   
   // Enable ACE FS file web editor and add FS info callback function
   myWebServer.enableFsCodeEditor();
-#if defined(ESP32)
-  myWebServer.setFsInfoCallback([](fsInfo_t* fsInfo) {
-    fsInfo->fsName = "LittleFS";
-    fsInfo->totalBytes = LittleFS.totalBytes();
-    fsInfo->usedBytes = LittleFS.usedBytes();  
-  });
-#endif
 
   // Start the webserver
   myWebServer.init();
diff --git a/examples/remoteOTA/remoteOTA.ino b/examples/remoteOTA/remoteOTA.ino
diff --git a/examples/simpleServer/simpleServer.ino b/examples/simpleServer/simpleServer.ino
diff --git a/examples/withWebSocket/withWebSocket.ino b/examples/withWebSocket/withWebSocket.ino
diff --git a/pio_examples/customOptions/src/customOptions.ino b/pio_examples/customOptions/src/customOptions.ino
diff --git a/src/AsyncFsWebServer.cpp b/src/AsyncFsWebServer.cpp
diff --git a/src/AsyncFsWebServer.h b/src/AsyncFsWebServer.h
