⏰ Refactors ntp service

app/src/routes/connections/ntp/NTP.svelte

@@ -18,7 +18,7 @@
     let ntpStatus: NTPStatus;
 
     async function getNTPStatus() {
-        const result = await api.get<NTPStatus>('/api/ntpStatus');
+        const result = await api.get<NTPStatus>('/api/ntp/status');
         if (result.isErr()) {
             console.error('Error:', result.inner);
             return;
@@ -27,7 +27,7 @@
     }
 
     async function getNTPSettings() {
-        const result = await api.get<NTPSettings>('/api/ntpSettings');
+        const result = await api.get<NTPSettings>('/api/ntp/settings');
         if (result.isErr()) {
             console.error('Error:', result.inner);
             return;
@@ -48,7 +48,7 @@
     };
 
     async function postNTPSettings(data: NTPSettings) {
-        const result = await api.post<NTPSettings>('/api/ntpSettings', data);
+        const result = await api.post<NTPSettings>('/api/ntp/settings', data);
         if (result.isErr()) {
             notifications.error('User not authorized.', 3000);
             console.error('Error:', result.inner);

esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp

@@ -21,10 +21,6 @@ ESP32SvelteKit::ESP32SvelteKit(PsychicHttpServer *server, unsigned int numberEnd
       _taskManager(),
       _featureService(server),
       _socket(server),
-#if FT_ENABLED(USE_NTP)
-      _ntpSettingsService(server, &ESPFS),
-      _ntpStatus(server),
-#endif
 #if FT_ENABLED(USE_UPLOAD_FIRMWARE)
       _uploadFirmwareService(server),
 #endif
@@ -97,6 +93,18 @@ void ESP32SvelteKit::setupServer() {
         return _apService.endpoint.handleStateUpdate(request, json);
     });
 
+    // NTP
+#if FT_ENABLED(USE_NTP)
+    _server->on("/api/ntp/status", HTTP_GET, [this](PsychicRequest *r) { return _ntpService.getStatus(r); });
+    _server->on("/api/ntp/time", HTTP_POST,
+                [this](PsychicRequest *r, JsonVariant &json) { return _ntpService.handleTime(r, json); });
+    _server->on("/api/ntp/settings", HTTP_GET,
+                [this](PsychicRequest *request) { return _ntpService.endpoint.getState(request); });
+    _server->on("/api/ntp/settings", HTTP_POST, [this](PsychicRequest *request, JsonVariant &json) {
+        return _ntpService.endpoint.handleStateUpdate(request, json);
+    });
+#endif
+
     // SYSTEM
     _server->on("/api/system/reset", HTTP_POST, system_service::handleReset);
     _server->on("/api/system/restart", HTTP_POST, system_service::handleRestart);
@@ -182,8 +190,7 @@ void ESP32SvelteKit::startServices() {
     _downloadFirmwareService.begin();
 #endif
 #if FT_ENABLED(USE_NTP)
-    _ntpSettingsService.begin();
-    _ntpStatus.begin();
+    _ntpService.begin();
 #endif
 #if FT_ENABLED(USE_ANALYTICS)
     _analyticsService.begin();

esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h

@@ -30,10 +30,9 @@
 #include <EventSocket.h>
 #include <FeaturesService.h>
 #include <MotionService.h>
-#include <NTPSettingsService.h>
+#include <ntp_service.h>
 #include <CameraService.h>
 #include <CameraSettingsService.h>
-#include <NTPStatus.h>
 #include <PsychicHttp.h>
 #include <TaskManager.h>
 #include <UploadFirmwareService.h>
@@ -74,10 +73,6 @@ class ESP32SvelteKit {
 
     EventSocket *getSocket() { return &_socket; }
 
-#if FT_ENABLED(USE_NTP)
-    StatefulService<NTPSettings> *getNTPSettingsService() { return &_ntpSettingsService; }
-#endif
-
 #if FT_ENABLED(USE_BATTERY)
     BatteryService *getBatteryService() { return &_batteryService; }
 #endif
@@ -117,8 +112,7 @@ class ESP32SvelteKit {
     APService _apService;
     EventSocket _socket;
 #if FT_ENABLED(USE_NTP)
-    NTPSettingsService _ntpSettingsService;
-    NTPStatus _ntpStatus;
+    NTPService _ntpService;
 #endif
 #if FT_ENABLED(USE_UPLOAD_FIRMWARE)
     UploadFirmwareService _uploadFirmwareService;