fix: webserver optimized && remove mDNS dep

Author: Times-Z

.devcontainer/Dockerfile

@@ -6,6 +6,7 @@ ENV LANG=C.UTF-8
 ENV EDITOR=nvim
 ARG USER=ubuntu
 ENV PATH /opt/esp/idf/components/spiffs:$PATH
+ENV ESPPORT /dev/ttyACM0
 
 RUN set -xe; \
     apt-get update \

README.md

@@ -72,6 +72,10 @@ Before setting up SmartClimate, ensure you have the following installed:
   idf.py monitor
   ```
 
+## Features
+
+- [x] Captive portal functionality compatible with both Android and iOS for easy Wi-Fi configuration.
+
 ## Roadmap
 
 - [ ] First release

dependencies.lock

@@ -9,16 +9,6 @@ dependencies:
       registry_url: https://components.espressif.com/
       type: service
     version: 2.5.5
-  espressif/mdns:
-    component_hash: 77ece55f01ce3723d8f1baff6e586fdb342adcbf956e39509a4fa323f278f290
-    dependencies:
-    - name: idf
-      require: private
-      version: '>=5.0'
-    source:
-      registry_url: https://components.espressif.com/
-      type: service
-    version: 1.8.1
   idf:
     source:
       type: idf
@@ -32,9 +22,8 @@ dependencies:
     version: 8.3.11
 direct_dependencies:
 - espressif/led_strip
-- espressif/mdns
 - idf
 - lvgl/lvgl
-manifest_hash: c663c3088ad6f4a8448e8c6000fc321b153779ca531545b2c162543bea70b5bd
+manifest_hash: 7f5441cfbe41ef1dd7c33d5b252c1e300dbbeaebba48fe575e26539d06f94caf
 target: esp32c6
 version: 2.0.0

main/idf_component.yml

@@ -1,5 +1,4 @@
 dependencies:
-  idf: '>=4.4'
+  idf: ">=4.4"
   lvgl/lvgl: ~8.3.0
   espressif/led_strip: ^2.4.1
-  espressif/mdns: '*'

main/webserver/html/index.html

@@ -4,10 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Setup SmartClimate</title>
-    <link
-      rel="stylesheet"
-      href="http://smartclimate.local/css/milligram.min.css"
-    />
+    <link rel="stylesheet" href="css/milligram.min.css" />
     <style>
       html,
       body {
@@ -34,12 +31,23 @@ <h2>Welcome to SmartClimate</h2>
           SmartClimate helps you monitor and optimize your environment. Follow
           the steps below to set up your system.
         </p>
-        <button class="button">Get Started</button>
+        <button class="button" id="get-started-btn">Get Started</button>
       </section>
     </main>
 
     <footer class="container">
-      <p>&copy; 2025 SmartClimate.</p>
+      <p>&copy; <span id="current-year"></span> SmartClimate.</p>
+      <script>
+        document.getElementById("current-year").textContent =
+          new Date().getFullYear();
+      </script>
     </footer>
+
+    <script src="js/umbrella.min.js"></script>
+    <script>
+      u("#get-started-btn").on("click", function () {
+        alert("Welcome to SmartClimate setup!");
+      });
+    </script>
   </body>
 </html>

main/webserver/html/js/umbrella.min.js

@@ -3,57 +3,84 @@
 static const char *TAG = "HTTP_SERVER";
 extern const char *SPIFFS_MOUNTPOINT;
 static char CSS_PATH[128];
+static char JS_PATH[128];
 
+/// @brief Serve a file from the SPIFFS filesystem
+/// @param req httpd_req_t
+/// @param file_path const char*
+/// @param content_type const char*
+/// @return esp_err_t
+static esp_err_t serve_file(httpd_req_t *req, const char *file_path, const char *content_type) {
+    FILE *file = fopen(file_path, "r");
+    if (file == NULL) {
+        ESP_LOGE(TAG, "Failed to open file: %s", file_path);
+        return httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to open file");
+    }
+
+    httpd_resp_set_type(req, content_type);
+    char buffer[1024];
+    size_t bytes_read;
+    while ((bytes_read = fread(buffer, 1, sizeof(buffer), file)) > 0) {
+        esp_err_t send_status = httpd_resp_send_chunk(req, buffer, bytes_read);
+        if (send_status != ESP_OK) {
+            fclose(file);
+            ESP_LOGE(TAG, "Error sending chunk from file: %s", file_path);
+            return send_status;
+        }
+    }
+    fclose(file);
+    return httpd_resp_send_chunk(req, NULL, 0);
+}
+
+/// @brief Log the request URI and status
+/// @param req httpd_req_t
+/// @param status esp_err_t
+/// @return esp_err_t
 static esp_err_t log_request(httpd_req_t *req, esp_err_t status) {
     ESP_LOGI(TAG, "Request URI : %s | Status : %d", req->uri, status);
     return status;
 }
 
+/// @brief setup page handler
+/// @param req httpd_req_t
+/// @return esp_err_t
+static esp_err_t setup_handler(httpd_req_t *req) {
+    esp_err_t status = serve_file(req, "/spiffs/index.html", "text/html");
+    return log_request(req, status);
+}
+
+/// @brief Handler for milligram CSS
+/// @param req httpd_req_t
+/// @return esp_err_t
 static esp_err_t milligram_handler(httpd_req_t *req) {
-    char resp[1024];
-    FILE *file = fopen(CSS_PATH, "r");
-    if (file == NULL) {
-        ESP_LOGE(TAG, "Failed to open %s", CSS_PATH);
-        return log_request(req, ESP_FAIL);
-    }
-    size_t read_bytes = fread(resp, 1, sizeof(resp) - 1, file);
-    fclose(file);
-    if (read_bytes == 0) {
-        ESP_LOGE(TAG, "Failed to read %s", CSS_PATH);
-        return log_request(req, ESP_FAIL);
-    }
-    resp[read_bytes] = '\0';
-    httpd_resp_set_type(req, "text/css");
-    esp_err_t status = httpd_resp_send(req, resp, HTTPD_RESP_USE_STRLEN);
+    esp_err_t status = serve_file(req, CSS_PATH, "text/css");
     return log_request(req, status);
 }
 
-static esp_err_t setup(httpd_req_t *req) {
-    char resp[1024];
-    FILE *file = fopen("/spiffs/index.html", "r");
-    if (file == NULL) {
-        ESP_LOGE(TAG, "Failed to open /spiffs/index.html");
-        return log_request(req, ESP_FAIL);
-    }
-    size_t read_bytes = fread(resp, 1, sizeof(resp) - 1, file);
-    fclose(file);
-    if (read_bytes == 0) {
-        ESP_LOGE(TAG, "Failed to read /spiffs/index.html");
-        return log_request(req, ESP_FAIL);
-    }
-    resp[read_bytes] = '\0';
-    esp_err_t status = httpd_resp_send(req, resp, HTTPD_RESP_USE_STRLEN);
+/// @brief Handler for milligram CSS
+/// @param req httpd_req_t
+/// @return esp_err_t
+static esp_err_t umbrella_handler(httpd_req_t *req) {
+    esp_err_t status = serve_file(req, JS_PATH, "text/javascript");
     return log_request(req, status);
 }
 
+/// @brief Connectivity check handler (captive portal)
+/// @param req httpd_req_t
+/// @return esp_err_t
 static esp_err_t connectivity_check(httpd_req_t *req) {
-    httpd_resp_set_hdr(req, "Location", "http://smartclimate.local/setup");
+    httpd_resp_set_hdr(req, "Location", "http://smartclimate/setup");
     httpd_resp_set_status(req, "301 Moved Permanently");
-    return log_request(req, httpd_resp_send(req, "", HTTPD_RESP_USE_STRLEN));
+    esp_err_t status = httpd_resp_send(req, "", HTTPD_RESP_USE_STRLEN);
+    return log_request(req, status);
 }
 
+/// @brief Default request handler for undefined URIs
+/// @param req httpd_req_t
+/// @param err httpd_err_code_t
+/// @return esp_err_t
 static esp_err_t default_handler(httpd_req_t *req, httpd_err_code_t err) {
-    ESP_LOGW(TAG, "Undefined URI requested : %s | Error code : %d", req->uri, err);
+    ESP_LOGW(TAG, "Undefined URI requested: %s | Error code: %d", req->uri, err);
     const char resp[] = "404 Not Found";
     esp_err_t status = httpd_resp_set_status(req, "404 Not Found");
     if (status == ESP_OK) {
@@ -62,39 +89,41 @@ static esp_err_t default_handler(httpd_req_t *req, httpd_err_code_t err) {
     return log_request(req, status);
 }
 
-httpd_uri_t setup_uri = {.uri = "/setup", .method = HTTP_GET, .handler = setup, .user_ctx = NULL};
-static httpd_uri_t connectivity_uris[] = {
-    {.uri = "/generate_204", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
-    {.uri = "/library/test/success.html", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
-    {.uri = "/hotspot-detect.html", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
-    {.uri = "/", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
-};
-httpd_uri_t css_uri = {
-    .uri = "/css/milligram.min.css", .method = HTTP_GET, .handler = milligram_handler, .user_ctx = NULL};
-
+/// @brief Start the webserver
+/// @param void
+/// @return httpd_handle_t
 httpd_handle_t webserver_start(void) {
     snprintf(CSS_PATH, sizeof(CSS_PATH), "%s/css/milligram.min.css", SPIFFS_MOUNTPOINT);
+    snprintf(JS_PATH, sizeof(JS_PATH), "%s/js/umbrella.min.js", SPIFFS_MOUNTPOINT);
+
     httpd_handle_t server = NULL;
     httpd_config_t config = HTTPD_DEFAULT_CONFIG();
 
-    ESP_ERROR_CHECK(mdns_init());
+    httpd_uri_t setup_uri = {.uri = "/setup", .method = HTTP_GET, .handler = setup_handler, .user_ctx = NULL};
 
-    mdns_hostname_set(APP_NAME);
-    mdns_instance_name_set("esp device");
+    static httpd_uri_t connectivity_uris[] = {
+        {.uri = "/generate_204", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
+        {.uri = "/library/test/success.html", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
+        {.uri = "/hotspot-detect.html", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
+        {.uri = "/", .method = HTTP_GET, .handler = connectivity_check, .user_ctx = NULL},
+    };
 
-    ESP_LOGI(TAG, "Webserver started on port : %d", config.server_port);
+    httpd_uri_t css_uri = {
+        .uri = "/css/milligram.min.css", .method = HTTP_GET, .handler = milligram_handler, .user_ctx = NULL};
+    httpd_uri_t js_uri = {
+        .uri = "/js/umbrella.min.js", .method = HTTP_GET, .handler = umbrella_handler, .user_ctx = NULL};
+
+    ESP_LOGI(TAG, "Webserver starting on port: %d", config.server_port);
     if (httpd_start(&server, &config) == ESP_OK) {
         httpd_register_uri_handler(server, &setup_uri);
         httpd_register_uri_handler(server, &css_uri);
+        httpd_register_uri_handler(server, &js_uri);
 
         for (size_t i = 0; i < sizeof(connectivity_uris) / sizeof(connectivity_uris[0]); i++) {
             httpd_register_uri_handler(server, &connectivity_uris[i]);
         }
 
         httpd_register_err_handler(server, HTTPD_404_NOT_FOUND, default_handler);
-
-        mdns_service_add("HTTP webserver", "_http", "_tcp", 80, NULL, 0);
-
         return server;
     }
     ESP_LOGE(TAG, "Error on webserver boot");

main/webserver/webserver.c

@@ -1,7 +1,8 @@
 #include <stdio.h>
 #include "esp_http_server.h"
 #include "esp_log.h"
-#include "espressif__mdns/include/mdns.h"
+#include <stdio.h>
+#include <string.h>
 
 extern const char *APP_NAME;