Merge remote-tracking branch 'upstream/main'

ewowi · ewowi · commit 41fea146c8b8 · 2025-12-04T20:01:53.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ ssl_certs/cacert.pem
 /scripts/__pycache__
 /site
 .DS_Store
+*.bak
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [WIP] - Next Release
+
+### Added
+
+- Add originID to StateUpdateResult update [#110](https://github.com/theelims/ESP32-sveltekit/pull/110)
+- Add originID to StateUpdateResult update [#110](https://github.com/theelims/ESP32-sveltekit/pull/110)
+- Ethernet Support [#107](https://github.com/theelims/ESP32-sveltekit/pull/107)
+
+### Changed
+
+- Changed the width of the confirm dialog.
+- SvelteKit bundling as single files to reduce heap consumption.
+
 ## [0.6.0] - 2025-11-03
 
 > [!CAUTION]
diff --git a/interface/src/lib/components/ConfirmDialog.svelte b/interface/src/lib/components/ConfirmDialog.svelte
@@ -31,16 +31,16 @@
 	{@const SvelteComponent = labels?.confirm.icon}
 	<div
 		role="dialog"
-		class="pointer-events-none fixed inset-0 z-50 flex items-center justify-center"
+		class="pointer-events-none fixed inset-0 z-50 flex items-center justify-center p-4"
 		transition:fly={{ y: 50 }}
 		use:focusTrap
 	>
 		<div
-			class="rounded-box bg-base-100 shadow-secondary/30 pointer-events-auto flex min-w-fit max-w-md flex-col justify-between p-4 shadow-lg"
+			class="rounded-box bg-base-100 shadow-secondary/30 pointer-events-auto flex w-full max-w-xs sm:max-w-sm md:max-w-md flex-col justify-between p-4 shadow-lg overflow-hidden"
 		>
-			<h2 class="text-base-content text-start text-2xl font-bold">{title}</h2>
+			<h2 class="text-base-content text-start text-2xl font-bold break-words">{title}</h2>
 			<div class="divider my-2"></div>
-			<p class="text-base-content mb-1 text-start">{@html message}</p>
+			<p class="text-base-content mb-1 text-start break-words whitespace-normal">{@html message}</p>
 			<div class="divider my-2"></div>
 			<div class="flex justify-end gap-2">
 				<button
diff --git a/interface/svelte.config.js b/interface/svelte.config.js
@@ -8,9 +8,6 @@ const config = {
 	preprocess: vitePreprocess(),
 
 	kit: {
-		output: {
-			bundleStrategy: 'single'
-		},
 		adapter: adapter({
 			pages: 'build',
 			assets: 'build',
@@ -20,8 +17,10 @@ const config = {
 		}),
 		alias: {
 			$src: './src'
-		}
-		//prerender: { default: true },
+		},
+        output: {
+            bundleStrategy: 'single'
+        }
 	}
 };
 
diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h
@@ -112,7 +112,7 @@ class APSettings
         root["subnet_mask"] = settings.subnetMask.toString();
     }
 
-    static StateUpdateResult update(JsonObject &root, APSettings &settings, const String &originId) // 🌙 add originID
+    static StateUpdateResult update(JsonObject &root, APSettings &settings, const String &originId)
     {
         APSettings newSettings = {};
         newSettings.provisionMode = root["provision_mode"] | FACTORY_AP_PROVISION_MODE;
diff --git a/lib/framework/EthernetSettingsService.cpp b/lib/framework/EthernetSettingsService.cpp
@@ -18,11 +18,11 @@ EthernetSettingsService::EthernetSettingsService(PsychicHttpServer *server,
                                                  FS *fs,
                                                  SecurityManager *securityManager,
                                                  EventSocket *socket) : _server(server),
-                                                 _securityManager(securityManager),
-                                                 _httpEndpoint(EthernetSettings::read, EthernetSettings::update, this, server, ETHERNET_SETTINGS_SERVICE_PATH, securityManager,
-                                                               AuthenticationPredicates::IS_ADMIN),
-                                                 _fsPersistence(EthernetSettings::read, EthernetSettings::update, this, fs, ETHERNET_SETTINGS_FILE),
-                                                 _socket(socket)
+                                                                        _securityManager(securityManager),
+                                                                        _httpEndpoint(EthernetSettings::read, EthernetSettings::update, this, server, ETHERNET_SETTINGS_SERVICE_PATH, securityManager,
+                                                                                      AuthenticationPredicates::IS_ADMIN),
+                                                                        _fsPersistence(EthernetSettings::read, EthernetSettings::update, this, fs, ETHERNET_SETTINGS_FILE),
+                                                                        _socket(socket)
 {
     addUpdateHandler([&](const String &originId)
                      { reconfigureEthernet(); },
@@ -82,11 +82,21 @@ void EthernetSettingsService::configureNetwork(ethernet_settings_t &network)
         // configure for DHCP
         ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
     }
-    // (re)start ethernet
+// (re)start ethernet
+#if CONFIG_IDF_TARGET_ESP32
+    // ESP32 chips with built-in ethernet MAC/PHY
     ETH.begin();
+#elif CONFIG_IDF_TARGET_ESP32P4
+    // todo: setup in P4
+#else
+    #ifdef ETH_PHY_TYPE //only if defined
+        // For SPI based ethernet modules like W5500, ENC28J60 etc.
+        SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI);
+        ETH.begin(ETH_PHY_TYPE, ETH_PHY_ADDR, ETH_PHY_CS, ETH_PHY_IRQ, ETH_PHY_RST, SPI);
+    #endif
+#endif
     // set hostname (again) after (re)starting ethernet due to a bug in the ESP-IDF implementation
     ETH.setHostname(_state.hostname.c_str());
-
 }
 
 void EthernetSettingsService::reconfigureEthernet()
diff --git a/lib/framework/EthernetSettingsService.h b/lib/framework/EthernetSettingsService.h
@@ -69,7 +69,7 @@ class EthernetSettings
         ESP_LOGV(SVK_TAG, "Ethernet Settings read");
     }
 
-    static StateUpdateResult update(JsonObject &root, EthernetSettings &settings, const String &originId) // 🌙 add originID
+    static StateUpdateResult update(JsonObject &root, EthernetSettings &settings, const String &originId)
     {
         settings.hostname = root["hostname"] | SettingValue::format(FACTORY_ETHERNET_HOSTNAME);
         settings.ethernetSettings.staticIPConfig = root["static_ip_config"] | false;
@@ -121,7 +121,6 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>
     void configureNetwork(ethernet_settings_t &network);
     void reconfigureEthernet();
     void updateEthernet();
-
 };
 
 #endif // end EthernetSettingsService_h
diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
@@ -52,7 +52,7 @@ class FSPersistence
             if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>())
             {
                 JsonObject jsonObject = jsonDocument.as<JsonObject>();
-                _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
+                _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater, _filePath);
                 settingsFile.close();
                 return;
             }
@@ -177,7 +177,7 @@ class FSPersistence
     {
         JsonDocument jsonDocument;
         JsonObject jsonObject = jsonDocument.to<JsonObject>(); // 🌙: to instead of as
-        _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
+        _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater, _filePath);
     }
 };
 
diff --git a/lib/framework/HttpEndpoint.h b/lib/framework/HttpEndpoint.h
@@ -88,7 +88,7 @@ class HttpEndpoint
                             }
 
                             JsonObject jsonObject = json.as<JsonObject>();
-                            StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
+                            StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater, _servicePath);
 
                             if (outcome == StateUpdateResult::ERROR)
                             {
diff --git a/lib/framework/MqttSettingsService.h b/lib/framework/MqttSettingsService.h
@@ -106,7 +106,7 @@ class MqttSettings
         root["message_interval_ms"] = settings.messageIntervalMs;
     }
 
-    static StateUpdateResult update(JsonObject &root, MqttSettings &settings, const String &originId) // 🌙 add originID
+    static StateUpdateResult update(JsonObject &root, MqttSettings &settings, const String &originId)
     {
         settings.enabled = root["enabled"] | FACTORY_MQTT_ENABLED;
         settings.uri = root["uri"] | FACTORY_MQTT_URI;
diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h
@@ -70,7 +70,7 @@ class SecuritySettings
         }
     }
 
-    static StateUpdateResult update(JsonObject &root, SecuritySettings &settings)
+    static StateUpdateResult update(JsonObject &root, SecuritySettings &settings, const String& originID)
     {
         // secret
         settings.jwtSecret = root["jwt_secret"] | SettingValue::format(FACTORY_JWT_SECRET);
diff --git a/lib/framework/StatefulService.h b/lib/framework/StatefulService.h
@@ -31,7 +31,7 @@ enum class StateUpdateResult
 };
 
 template <typename T>
-using JsonStateUpdater = std::function<StateUpdateResult(JsonObject &root, T &settings, const String &originId)>; // 🌙 add originID
+using JsonStateUpdater = std::function<StateUpdateResult(JsonObject &root, T &settings, const String &originId)>;
 
 template <typename T>
 using JsonStateReader = std::function<void(T &settings, JsonObject &root)>;
@@ -133,7 +133,7 @@ class StatefulService
         return result;
     }
 
-    StateUpdateResult updateWithoutPropagation(std::function<StateUpdateResult(T &)> stateUpdater)
+    StateUpdateResult updateWithoutPropagation(std::function<StateUpdateResult(T &)> stateUpdater, const String &originId)
     {
         beginTransaction();
         StateUpdateResult result = stateUpdater(_state);
@@ -144,7 +144,7 @@ class StatefulService
     StateUpdateResult update(JsonObject &jsonObject, JsonStateUpdater<T> stateUpdater, const String &originId)
     {
         beginTransaction();
-        StateUpdateResult result = stateUpdater(jsonObject, _state, originId); // 🌙 add originID
+        StateUpdateResult result = stateUpdater(jsonObject, _state, originId);
         endTransaction();
         callHookHandlers(originId, result);
         if (result == StateUpdateResult::CHANGED)
@@ -154,10 +154,10 @@ class StatefulService
         return result;
     }
 
-    StateUpdateResult updateWithoutPropagation(JsonObject &jsonObject, JsonStateUpdater<T> stateUpdater)
+    StateUpdateResult updateWithoutPropagation(JsonObject &jsonObject, JsonStateUpdater<T> stateUpdater, const String &originId)
     {
         beginTransaction();
-        StateUpdateResult result = stateUpdater(jsonObject, _state, "originID"); // 🌙 add originID: todo: add as argument from updateWithoutPropagation
+        StateUpdateResult result = stateUpdater(jsonObject, _state, originId);
         endTransaction();
         return result;
     }
diff --git a/lib/framework/WWWData.h b/lib/framework/WWWData.h
diff --git a/lib/framework/WiFiSettingsService.cpp b/lib/framework/WiFiSettingsService.cpp
diff --git a/src/MoonBase/SharedHttpEndpoint.h b/src/MoonBase/SharedHttpEndpoint.h

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class APSettings`
`112`	`112`	`root["subnet_mask"] = settings.subnetMask.toString();`
`113`	`113`	`}`
`114`	`114`
`115`		`- static StateUpdateResult update(JsonObject &root, APSettings &settings, const String &originId) // 🌙 add originID`
	`115`	`+ static StateUpdateResult update(JsonObject &root, APSettings &settings, const String &originId)`
`116`	`116`	`{`
`117`	`117`	`APSettings newSettings = {};`
`118`	`118`	`newSettings.provisionMode = root["provision_mode"] \| FACTORY_AP_PROVISION_MODE;`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class EthernetSettings`
`69`	`69`	`ESP_LOGV(SVK_TAG, "Ethernet Settings read");`
`70`	`70`	`}`
`71`	`71`
`72`		`- static StateUpdateResult update(JsonObject &root, EthernetSettings &settings, const String &originId) // 🌙 add originID`
	`72`	`+ static StateUpdateResult update(JsonObject &root, EthernetSettings &settings, const String &originId)`
`73`	`73`	`{`
`74`	`74`	`settings.hostname = root["hostname"] \| SettingValue::format(FACTORY_ETHERNET_HOSTNAME);`
`75`	`75`	`settings.ethernetSettings.staticIPConfig = root["static_ip_config"] \| false;`
`@@ -121,7 +121,6 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>`
`121`	`121`	`void configureNetwork(ethernet_settings_t &network);`
`122`	`122`	`void reconfigureEthernet();`
`123`	`123`	`void updateEthernet();`
`124`		`-`
`125`	`124`	`};`
`126`	`125`
`127`	`126`	`#endif // end EthernetSettingsService_h`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class FSPersistence`
`52`	`52`	`if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>())`
`53`	`53`	`{`
`54`	`54`	`JsonObject jsonObject = jsonDocument.as<JsonObject>();`
`55`		`- _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);`
	`55`	`+ _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater, _filePath);`
`56`	`56`	`settingsFile.close();`
`57`	`57`	`return;`
`58`	`58`	`}`
`@@ -177,7 +177,7 @@ class FSPersistence`
`177`	`177`	`{`
`178`	`178`	`JsonDocument jsonDocument;`
`179`	`179`	`JsonObject jsonObject = jsonDocument.to<JsonObject>(); // 🌙: to instead of as`
`180`		`- _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);`
	`180`	`+ _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater, _filePath);`
`181`	`181`	`}`
`182`	`182`	`};`
`183`	`183`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class HttpEndpoint`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`JsonObject jsonObject = json.as<JsonObject>();`
`91`		`- StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);`
	`91`	`+ StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater, _servicePath);`
`92`	`92`
`93`	`93`	`if (outcome == StateUpdateResult::ERROR)`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class MqttSettings`
`106`	`106`	`root["message_interval_ms"] = settings.messageIntervalMs;`
`107`	`107`	`}`
`108`	`108`
`109`		`- static StateUpdateResult update(JsonObject &root, MqttSettings &settings, const String &originId) // 🌙 add originID`
	`109`	`+ static StateUpdateResult update(JsonObject &root, MqttSettings &settings, const String &originId)`
`110`	`110`	`{`
`111`	`111`	`settings.enabled = root["enabled"] \| FACTORY_MQTT_ENABLED;`
`112`	`112`	`settings.uri = root["uri"] \| FACTORY_MQTT_URI;`