tidy up restart

interface/src/app/settings/DownloadUpload.tsx

@@ -4,7 +4,6 @@ import { toast } from 'react-toastify';
 import CancelIcon from '@mui/icons-material/Cancel';
 import DownloadIcon from '@mui/icons-material/GetApp';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
-import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
   Box,
@@ -25,7 +24,13 @@ import {
   getSchedule,
   getSettings
 } from 'api/app';
-import { checkUpgrade, getDevVersion, getStableVersion } from 'api/system';
+import {
+  checkUpgrade,
+  getDevVersion,
+  getStableVersion,
+  restart,
+  uploadURL
+} from 'api/system';
 
 import { dialogStyle } from 'CustomTheme';
 import { useRequest } from 'alova/client';
@@ -33,7 +38,6 @@ import type { APIcall } from 'app/main/types';
 import RestartMonitor from 'app/status/RestartMonitor';
 import {
   FormLoader,
-  MessageBox,
   SectionContent,
   SingleUpload,
   useLayoutTitle
@@ -44,7 +48,6 @@ const DownloadUpload = () => {
   const { LL } = useI18nContext();
 
   const [restarting, setRestarting] = useState<boolean>(false);
-  const [restartNeeded, setRestartNeeded] = useState<boolean>(false);
   const [openDialog, setOpenDialog] = useState<boolean>(false);
   const [useDev, setUseDev] = useState<boolean>(false);
   const [upgradeAvailable, setUpgradeAvailable] = useState<boolean>(false);
@@ -89,24 +92,21 @@ const DownloadUpload = () => {
   } = useRequest(SystemApi.readHardwareStatus);
 
   const { send: sendUploadURL } = useRequest(
-    (data: { url: string }) => SystemApi.uploadURL(data),
+    (data: { url: string }) => uploadURL(data),
     {
       immediate: false
     }
   );
 
-  const { send: restartCommand } = useRequest(SystemApi.restart(), {
+  const { send: restartCommand } = useRequest(restart(), {
     immediate: false
   });
 
-  const restart = async () => {
+  const callRestart = async () => {
-    await restartCommand()
+    setRestarting(true);
-      .then(() => {
+    await restartCommand().catch((error: Error) => {
-        setRestarting(true);
+      toast.error(error.message);
-      })
+    });
-      .catch((error: Error) => {
-        toast.error(error.message);
-      });
   };
 
   const { send: sendCheckUpgrade } = useRequest(checkUpgrade, {
@@ -387,10 +387,11 @@ const DownloadUpload = () => {
               </Button>
             )}
           </Typography>
-          {upgradeAvailable ? (
+          <Typography mt={2} color="secondary">
-            <Typography mt={2} color="secondary">
+            <InfoOutlinedIcon color="secondary" sx={{ verticalAlign: 'middle' }} />
-              <InfoOutlinedIcon color="secondary" sx={{ verticalAlign: 'middle' }} />
+            &nbsp;&nbsp;
-              &nbsp;&nbsp;{LL.UPGRADE_AVAILABLE()}
+            {upgradeAvailable ? LL.UPGRADE_AVAILABLE() : LL.LATEST_VERSION()}
+            {upgradeAvailable && (
               <Button
                 sx={{ ml: 2 }}
                 size="small"
@@ -400,10 +401,9 @@ const DownloadUpload = () => {
               >
                 {LL.INSTALL('v' + isDev ? latestDevVersion : latestVersion)}
               </Button>
-            </Typography>
+            )}
-          ) : (
+          </Typography>
-            <Typography mt={2}>{LL.LATEST_VERSION()}</Typography>
+
-          )}
           {renderUploadDialog()}
         </Box>
 
@@ -411,24 +411,11 @@ const DownloadUpload = () => {
           {LL.UPLOAD()}
         </Typography>
 
-        <Box mb={2} color="warning.main">
+        <Box color="warning.main" sx={{ pb: 2 }}>
           <Typography variant="body2">{LL.UPLOAD_TEXT()}</Typography>
         </Box>
 
-        {restartNeeded ? (
+        <SingleUpload callRestart={callRestart} />
-          <MessageBox mt={2} level="warning" message={LL.RESTART_TEXT(0)}>
-            <Button
-              startIcon={<PowerSettingsNewIcon />}
-              variant="contained"
-              color="error"
-              onClick={restart}
-            >
-              {LL.RESTART()}
-            </Button>
-          </MessageBox>
-        ) : (
-          <SingleUpload setRestartNeeded={setRestartNeeded} />
-        )}
       </>
     );
   };

interface/src/app/status/RestartMonitor.tsx

@@ -1,13 +1,13 @@
 import { type FC, useEffect, useRef, useState } from 'react';
 
-import * as SystemApi from 'api/system';
+import { readHardwareStatus } from 'api/system';
 
 import { useRequest } from 'alova/client';
 import { FormLoader } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 
 const RESTART_TIMEOUT = 2 * 60 * 1000; // 2 minutes
-const POLL_INTERVAL = 1000; // every 1 second
+const POLL_INTERVAL = 2000; // every 2 seconds
 
 export interface RestartMonitorProps {
   message?: string;
@@ -16,10 +16,12 @@ export interface RestartMonitorProps {
 const RestartMonitor: FC<RestartMonitorProps> = ({ message }) => {
   const [failed, setFailed] = useState<boolean>(false);
   const [timeoutId, setTimeoutId] = useState<NodeJS.Timeout>();
+
   const { LL } = useI18nContext();
+
   const timeoutAt = useRef(new Date().getTime() + RESTART_TIMEOUT);
 
-  const { send } = useRequest(SystemApi.readSystemStatus);
+  const { send } = useRequest(readHardwareStatus, { immediate: false });
 
   const poll = useRef(async () => {
     try {
@@ -35,7 +37,7 @@ const RestartMonitor: FC<RestartMonitorProps> = ({ message }) => {
   });
 
   useEffect(() => {
-    void poll.current();
+    setTimeoutId(setTimeout(poll.current, POLL_INTERVAL));
   }, []);
 
   useEffect(() => () => timeoutId && clearTimeout(timeoutId), [timeoutId]);

interface/src/app/status/Status.tsx

@@ -52,24 +52,12 @@ const SystemStatus = () => {
   const { me } = useContext(AuthenticatedContext);
 
   const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
-  const [processing, setProcessing] = useState<boolean>(false);
   const [restarting, setRestarting] = useState<boolean>();
 
   const { send: restartCommand } = useRequest(SystemApi.restart(), {
     immediate: false
   });
 
-  const { send: partitionCommand } = useRequest(SystemApi.partition(), {
-    immediate: false
-  });
-
-  const { send: factoryPartitionCommand } = useRequest(
-    SystemApi.factoryPartition(),
-    {
-      immediate: false
-    }
-  );
-
   const {
     data: data,
     send: loadData,
@@ -208,7 +196,6 @@ const SystemStatus = () => {
     value ? theme.palette.success.main : theme.palette.info.main;
 
   const restart = async () => {
-    setProcessing(true);
     await restartCommand()
       .then(() => {
         setRestarting(true);
@@ -218,37 +205,6 @@ const SystemStatus = () => {
       })
       .finally(() => {
         setConfirmRestart(false);
-        setProcessing(false);
-      });
-  };
-
-  const partition = async () => {
-    setProcessing(true);
-    await partitionCommand()
-      .then(() => {
-        setRestarting(true);
-      })
-      .catch((error: Error) => {
-        toast.error(error.message);
-      })
-      .finally(() => {
-        setConfirmRestart(false);
-        setProcessing(false);
-      });
-  };
-
-  const factoryPartition = async () => {
-    setProcessing(true);
-    await factoryPartitionCommand()
-      .then(() => {
-        setRestarting(true);
-      })
-      .catch((error: Error) => {
-        toast.error(error.message);
-      })
-      .finally(() => {
-        setConfirmRestart(false);
-        setProcessing(false);
       });
   };
 
@@ -265,38 +221,14 @@ const SystemStatus = () => {
           startIcon={<CancelIcon />}
           variant="outlined"
           onClick={() => setConfirmRestart(false)}
-          disabled={processing}
           color="secondary"
         >
           {LL.CANCEL()}
         </Button>
-        {data.has_loader && (
-          <Button
-            startIcon={<PowerSettingsNewIcon />}
-            variant="outlined"
-            onClick={factoryPartition}
-            disabled={processing}
-            color="warning"
-          >
-            EMS-ESP Boot
-          </Button>
-        )}
-        {data.has_partition && (
-          <Button
-            startIcon={<PowerSettingsNewIcon />}
-            variant="outlined"
-            onClick={partition}
-            disabled={processing}
-            color="warning"
-          >
-            Partition
-          </Button>
-        )}
         <Button
           startIcon={<PowerSettingsNewIcon />}
           variant="outlined"
           onClick={restart}
-          disabled={processing}
           color="error"
         >
           {LL.RESTART()}

interface/src/components/upload/DragNdrop.tsx

@@ -8,7 +8,7 @@ import { Box, Button } from '@mui/material';
 
 import { useI18nContext } from 'i18n/i18n-react';
 
-import './drag-drop.css';
+import './dragNdrop.css';
 
 const DragNdrop = ({ onFileSelected }) => {
   const [file, setFile] = useState<File>();

interface/src/components/upload/SingleUpload.tsx

@@ -32,7 +32,7 @@ function LinearProgressWithLabel(props: LinearProgressProps & { value: number })
   );
 }
 
-const SingleUpload = ({ setRestartNeeded }) => {
+const SingleUpload = ({ callRestart }) => {
   const [md5, setMd5] = useState<string>();
   const [file, setFile] = useState<File>();
   const { LL } = useI18nContext();
@@ -44,19 +44,18 @@ const SingleUpload = ({ setRestartNeeded }) => {
     abort: cancelUpload
   } = useRequest(SystemApi.uploadFile, {
     immediate: false
-  }).onSuccess(({ data }) => {
+  }).onComplete(({ data }) => {
     if (data) {
       setMd5(data.md5 as string);
       toast.success(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL());
       setFile(undefined);
     } else {
-      setRestartNeeded(true);
+      callRestart();
     }
   });
 
   useEffect(async () => {
     if (file) {
-      console.log('going to upload file ', file.name);
       await sendUpload(file).catch((error: Error) => {
         if (error.message === 'The user aborted a request') {
           toast.warning(LL.UPLOAD() + ' ' + LL.ABORTED());
@@ -73,7 +72,7 @@ const SingleUpload = ({ setRestartNeeded }) => {
     <>
       {isUploading ? (
         <>
-          <Box width="100%" p={2}>
+          <Box width="100%" pl={2} pr={2}>
             <LinearProgressWithLabel
               value={
                 progress.total === 0 || progress.loaded === 0
@@ -86,7 +85,7 @@ const SingleUpload = ({ setRestartNeeded }) => {
           </Box>
 
           <Button
-            sx={{ ml: 2 }}
+            sx={{ ml: 2, mt: 2 }}
             startIcon={<CancelIcon />}
             variant="outlined"
             color="error"

lib/framework/RestartService.cpp

@@ -8,52 +8,13 @@ RestartService::RestartService(AsyncWebServer * server, SecurityManager * securi
     server->on(RESTART_SERVICE_PATH,
                HTTP_POST,
                securityManager->wrapRequest([this](AsyncWebServerRequest * request) { restart(request); }, AuthenticationPredicates::IS_ADMIN));
-    server->on(PARTITION_SERVICE_PATH,
-               HTTP_POST,
-               securityManager->wrapRequest([this](AsyncWebServerRequest * request) { partition(request); }, AuthenticationPredicates::IS_ADMIN));
-    server->on(FACTORYPARTITION_SERVICE_PATH,
-               HTTP_POST,
-               securityManager->wrapRequest([this](AsyncWebServerRequest * request) { factory(request); }, AuthenticationPredicates::IS_ADMIN));
 }
 
 void RestartService::restartNow() {
-    WiFi.disconnect(true);
+    emsesp::EMSESP::system_.restart_requested(true); // will be handled by the main loop
-    delay(500);
-    ESP.restart();
 }
 
 void RestartService::restart(AsyncWebServerRequest * request) {
-    emsesp::EMSESP::system_.store_nvs_values();
-    request->onDisconnect(RestartService::restartNow);
-    request->send(200);
-}
-
-void RestartService::partition(AsyncWebServerRequest * request) {
-    const esp_partition_t * ota_partition = esp_ota_get_next_update_partition(nullptr);
-    if (!ota_partition) {
-        request->send(400); // bad request
-        return;
-    }
-    uint64_t buffer;
-    esp_partition_read(ota_partition, 0, &buffer, 8);
-    if (buffer == 0xFFFFFFFFFFFFFFFF) { // partition empty
-        request->send(400);             // bad request
-        return;
-    }
-    esp_ota_set_boot_partition(ota_partition);
-    emsesp::EMSESP::system_.store_nvs_values();
-    request->onDisconnect(RestartService::restartNow);
-    request->send(200);
-}
-
-void RestartService::factory(AsyncWebServerRequest * request) {
-    const esp_partition_t * factory_partition = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_FACTORY, nullptr);
-    if (!factory_partition) {
-        request->send(400);
-        return;
-    }
-    esp_ota_set_boot_partition(factory_partition);
-    emsesp::EMSESP::system_.store_nvs_values();
     request->onDisconnect(RestartService::restartNow);
     request->send(200);
 }

lib/framework/RestartService.h

@@ -8,8 +8,6 @@
 #include "SecurityManager.h"
 
 #define RESTART_SERVICE_PATH "/rest/restart"
-#define PARTITION_SERVICE_PATH "/rest/partition"
-#define FACTORYPARTITION_SERVICE_PATH "/rest/factoryPartition"
 
 class RestartService {
   public:
@@ -19,8 +17,6 @@ class RestartService {
 
   private:
     void restart(AsyncWebServerRequest * request);
-    void partition(AsyncWebServerRequest * request);
-    void factory(AsyncWebServerRequest * request);
 };
 
 #endif

lib/framework/UploadFileService.cpp

@@ -121,20 +121,18 @@ void UploadFileService::uploadComplete(AsyncWebServerRequest * request) {
     // did we just complete uploading a json file?
     if (request->_tempFile) {
         request->_tempFile.close(); // close the file handle as the upload is now done
-        emsesp::EMSESP::system_.store_nvs_values();
-        request->onDisconnect(RestartService::restartNow);
         AsyncWebServerResponse * response = request->beginResponse(200);
         request->send(response);
+        request->onDisconnect(RestartService::restartNow);
         return;
     }
 
     // check if it was a firmware upgrade
     // if no error, send the success response as a JSON
     if (_is_firmware && !request->_tempObject) {
-        emsesp::EMSESP::system_.store_nvs_values();
-        request->onDisconnect(RestartService::restartNow);
         AsyncWebServerResponse * response = request->beginResponse(200);
         request->send(response);
+        request->onDisconnect(RestartService::restartNow);
         return;
     }
 

src/system.cpp

@@ -288,40 +288,50 @@ void System::store_nvs_values() {
 }
 
 // restart EMS-ESP
+// app0 or app1
+// on 16MB we have the additional boot and factory partitions
 void System::system_restart(const char * partitionname) {
 #ifndef EMSESP_STANDALONE
+    // see if we are forcing a partition to use
     if (partitionname != nullptr) {
+        // Factory partition - label will be "factory"
         const esp_partition_t * partition = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_FACTORY, NULL);
         if (partition && strcmp(partition->label, partitionname) == 0) {
             esp_ota_set_boot_partition(partition);
-        } else if (strcmp(esp_ota_get_running_partition()->label, partitionname) != 0) {
+        } else
-            partition = esp_ota_get_next_update_partition(NULL);
+            // try and find the parition by name
-            if (!partition) {
+            if (strcmp(esp_ota_get_running_partition()->label, partitionname) != 0) {
-                LOG_ERROR("Partition '%s' not found", partitionname);
+                partition = esp_ota_get_next_update_partition(nullptr);
-                return;
+                if (!partition) {
-            }
-            if (strcmp(partition->label, partitionname) != 0 && strcmp(partitionname, "boot") != 0) {
-                partition = esp_ota_get_next_update_partition(partition);
-                if (!partition || strcmp(partition->label, partitionname)) {
                     LOG_ERROR("Partition '%s' not found", partitionname);
                     return;
                 }
+                if (strcmp(partition->label, partitionname) != 0 && strcmp(partitionname, "boot") != 0) {
+                    partition = esp_ota_get_next_update_partition(partition);
+                    if (!partition || strcmp(partition->label, partitionname)) {
+                        LOG_ERROR("Partition '%s' not found", partitionname);
+                        return;
+                    }
+                }
+                // check if partition is empty
+                uint64_t buffer;
+                esp_partition_read(partition, 0, &buffer, 8);
+                if (buffer == 0xFFFFFFFFFFFFFFFF) {
+                    LOG_ERROR("Partition '%s' is empty, not bootable", partition->label);
+                    return;
+                }
+                // set the boot partition
+                esp_ota_set_boot_partition(partition);
             }
-            uint64_t buffer;
-            esp_partition_read(partition, 0, &buffer, 8);
-            if (buffer == 0xFFFFFFFFFFFFFFFF) { // partition empty
-                LOG_ERROR("Partition '%s' is empty, not bootable", partition->label);
-                return;
-            }
-            esp_ota_set_boot_partition(partition);
-        }
         LOG_INFO("Restarting EMS-ESP from %s partition", partitionname);
     } else {
         LOG_INFO("Restarting EMS-ESP...");
     }
-    store_nvs_values();
+
-    Shell::loop_all();
+    restart_requested(false); // make sure it's not repeated
-    delay(1000); // wait a second
+    store_nvs_values();       // save any NVS values
+    Shell::loop_all();        // flush log to output
+    delay(1000);              // wait 1 second
     ESP.restart();
 #endif
 }
@@ -597,12 +607,13 @@ void System::upload_status(bool in_progress) {
 void System::loop() {
     // check if we're supposed to do a reset/restart
     if (restart_requested()) {
-        this->system_restart();
+        system_restart();
     }
 
 #ifndef EMSESP_STANDALONE
     myPButton_.check(); // check button press
 
+    // syslog
     if (syslog_enabled_) {
         syslog_.loop();
     }
@@ -1875,7 +1886,7 @@ bool System::uploadFirmwareURL(const char * url) {
         return false;
     }
 
-    // flush buffers so latest log messages are shown
+    // flush log buffers so latest messages are shown
     Shell::loop_all();
 
     // get tcp stream and send it to Updater