Restuctures template

esp32/build_settings.ini

@@ -3,6 +3,7 @@ build_flags =
     -D BUILD_TARGET=\"$PIOENV\"
     -D ESP32SVELTEKIT_RUNNING_CORE=0
     -D EMBED_WWW
-    ;-D ENABLE_CORS
+    -D SERVE_CONFIG_FILES
+    -D CORS_ORIGIN=\"*\"
+    -D ENABLE_CORS
     ;-D SERIAL_INFO
-    ;-D CORS_ORIGIN=\"*\"

esp32/features.ini

@@ -2,9 +2,9 @@
 build_flags = 
   -D FT_BATTERY=0
   -D FT_NTP=1
-  -D FT_SECURITY=1
+  -D FT_SECURITY=0
   -D FT_MQTT=1
-  -D FT_SLEEP=0
+  -D FT_SLEEP=1
   -D FT_UPLOAD_FIRMWARE=1
   -D FT_DOWNLOAD_FIRMWARE=1
   -D FT_ANALYTICS=1

esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp

@@ -7,6 +7,7 @@
  *
  *   Copyright (C) 2018 - 2023 rjwats
  *   Copyright (C) 2024 theelims
+ *   Copyright (C) 2024 runeharlyk
  *
  *   All Rights Reserved. This software may be modified and distributed under
  *   the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -14,10 +15,9 @@
 
 #include <ESP32SvelteKit.h>
 
-ESP32SvelteKit::ESP32SvelteKit(PsychicHttpServer *server, unsigned int numberEndpoints) : _server(server),
+ESP32SvelteKit::ESP32SvelteKit(PsychicHttpServer *server, unsigned int numberEndpoints)
-                                                                                          _numberEndpoints(numberEndpoints),
+    : _server(server), _numberEndpoints(numberEndpoints),
-                                                                                          _featureService(server),
+      _featureService(server), _securitySettingsService(server, &ESPFS),
-                                                                                          _securitySettingsService(server, &ESPFS),
       _wifiSettingsService(server, &ESPFS, &_securitySettingsService, &_socket),
       _wifiScanner(server, &_securitySettingsService),
       _wifiStatus(server, &_securitySettingsService),
@@ -52,30 +52,38 @@ ESP32SvelteKit::ESP32SvelteKit(PsychicHttpServer *server, unsigned int numberEnd
 #endif
       _restartService(server, &_securitySettingsService),
       _factoryResetService(server, &ESPFS, &_securitySettingsService),
-                                                                                          _systemStatus(server, &_securitySettingsService)
+      _systemStatus(server, &_securitySettingsService) {
-{
 }
 
-void ESP32SvelteKit::begin()
+void ESP32SvelteKit::begin() {
-{
   ESP_LOGV("ESP32SvelteKit", "Loading settings from files system");
+  ESP_LOGI("Running Firmware Version: %s\n", APP_VERSION);
   ESPFS.begin(true);
 
   _wifiSettingsService.initWiFi();
 
-    // SvelteKit uses a lot of handlers, so we need to increase the max_uri_handlers
+  setupServer();
-    // WWWData has 77 Endpoints, Framework has 27, and Lighstate Demo has 4
+
+  setupMDNS();
+
+  startServices();
+
+  ESP_LOGV("ESP32SvelteKit", "Starting loop task");
+  xTaskCreatePinnedToCore(this->_loopImpl, "ESP32 SvelteKit Loop", 4096, this,
+                          (tskIDLE_PRIORITY + 1), NULL,
+                          ESP32SVELTEKIT_RUNNING_CORE);
+}
+
+void ESP32SvelteKit::setupServer() {
   _server->config.max_uri_handlers = _numberEndpoints;
   _server->listen(80);
 
 #ifdef EMBED_WWW
   // Serve static resources from PROGMEM
-    ESP_LOGV("ESP32SvelteKit", "Registering routes from PROGMEM static resources");
+  ESP_LOGV("ESP32SvelteKit",
-    WWWData::registerRoutes(
+           "Registering routes from PROGMEM static resources");
-        [&](const String &uri, const String &contentType, const uint8_t *content, size_t len)
+  WWWData::registerRoutes([&](const String &uri, const String &contentType, const uint8_t *content, size_t len) {
-        {
+    PsychicHttpRequestCallback requestHandler = [contentType, content, len](PsychicRequest *request) {
-            PsychicHttpRequestCallback requestHandler = [contentType, content, len](PsychicRequest *request)
-            {
       PsychicResponse response(request);
       response.setCode(200);
       response.setContentType(contentType.c_str());
@@ -90,53 +98,52 @@ void ESP32SvelteKit::begin()
 
     // Set default end-point for all non matching requests
     // this is easier than using webServer.onNotFound()
-            if (uri.equals("/index.html"))
+    if (uri.equals("/index.html")) {
-            {
       _server->defaultEndpoint->setHandler(handler);
     }
   });
 #else
   // Serve static resources from /www/
-    ESP_LOGV("ESP32SvelteKit", "Registering routes from FS /www/ static resources");
+  ESP_LOGV("ESP32SvelteKit",
+           "Registering routes from FS /www/ static resources");
   _server->serveStatic("/_app/", ESPFS, "/www/_app/");
   _server->serveStatic("/favicon.png", ESPFS, "/www/favicon.png");
   //  Serving all other get requests with "/www/index.htm"
-    _server->onNotFound([](PsychicRequest *request)
+  _server->onNotFound([](PsychicRequest *request) {
-                        {
     if (request->method() == HTTP_GET) {
-            PsychicFileResponse response(request, ESPFS, "/www/index.html", "text/html");
+      PsychicFileResponse response(request, ESPFS, "/www/index.html",
+                                   "text/html");
       return response.send();
       // String url = "http://" + request->host() + "/index.html";
       // request->redirect(url.c_str());
-        } });
+    }
+  });
 #endif
 #ifdef SERVE_CONFIG_FILES
   _server->serveStatic("/config/", ESPFS, "/config/");
 #endif
 
-    // Serve static resources from /config/ if set by platformio.ini
-#if SERVE_CONFIG_FILES
-    _server->serveStatic("/config/", ESPFS, "/config/");
-#endif
-
 #if defined(ENABLE_CORS)
   ESP_LOGV("ESP32SvelteKit", "Enabling CORS headers");
-    DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", CORS_ORIGIN);
+  DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin",
-    DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
+                                       CORS_ORIGIN);
-    DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials", "true");
+  DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers",
+                                       "Accept, Content-Type, Authorization");
+  DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials",
+                                       "true");
 #endif
+}
 
+void ESP32SvelteKit::setupMDNS() {
   ESP_LOGV("ESP32SvelteKit", "Starting MDNS");
   MDNS.begin(_wifiSettingsService.getHostname().c_str());
   MDNS.setInstanceName(_appName);
   MDNS.addService("http", "tcp", 80);
   MDNS.addService("ws", "tcp", 80);
   MDNS.addServiceTxt("http", "tcp", "Firmware Version", APP_VERSION);
+}
 
-#ifdef SERIAL_INFO
+void ESP32SvelteKit::startServices() {
-    Serial.printf("Running Firmware Version: %s\n", APP_VERSION);
-#endif
-
   // Start the services
   _apStatus.begin();
   _socket.begin();
@@ -176,24 +183,10 @@ void ESP32SvelteKit::begin()
 #if FT_ENABLED(FT_BATTERY)
   _batteryService.begin();
 #endif
-
-    // Start the loop task
-    ESP_LOGV("ESP32SvelteKit", "Starting loop task");
-    xTaskCreatePinnedToCore(
-        this->_loopImpl,            // Function that should be called
-        "ESP32 SvelteKit Loop",     // Name of the task (for debugging)
-        4096,                       // Stack size (bytes)
-        this,                       // Pass reference to this class instance
-        (tskIDLE_PRIORITY + 1),     // task priority
-        NULL,                       // Task handle
-        ESP32SVELTEKIT_RUNNING_CORE // Pin to application core
-    );
 }
 
-void ESP32SvelteKit::_loop()
+void ESP32SvelteKit::_loop() {
-{
+  while (1) {
-    while (1)
-    {
     _wifiSettingsService.loop(); // 30 seconds
     _apSettingsService.loop();   // 10 seconds
 #if FT_ENABLED(FT_MQTT)

esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h

@@ -10,6 +10,7 @@
  *
  *   Copyright (C) 2018 - 2023 rjwats
  *   Copyright (C) 2023 theelims
+ *   Copyright (C) 2024 runeharlyk
  *
  *   All Rights Reserved. This software may be modified and distributed under
  *   the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -52,11 +53,11 @@
 #endif
 
 #ifndef APP_VERSION
-#define APP_VERSION "demo"
+#define APP_VERSION "v1"
 #endif
 
 #ifndef APP_NAME
-#define APP_NAME "ESP32 SvelteKit Demo"
+#define APP_NAME "SpotMicro"
 #endif
 
 #ifndef ESP32SVELTEKIT_RUNNING_CORE
@@ -206,6 +207,9 @@ private:
 protected:
     static void _loopImpl(void *_this) { static_cast<ESP32SvelteKit *>(_this)->_loop(); }
     void _loop();
+    void setupServer();
+    void setupMDNS();
+    void startServices();
 };
 
 #endif