safe upload and get update progress

src/OpenRouter/OpenRouter.cpp

@@ -18,12 +18,13 @@ OpenRouter::OpenRouter()
     this->srv.Post("/api/settings/restore/defaults", api::settings::restore_defaults);
 
     this->srv.Post("/api/system/reboot", api::system::reboot);
-
     this->srv.Get("/api/system/syslog", api::system::get_syslog);
 #ifdef __linux__
     this->srv.Get("/api/system/uptime", api::system::get_uptime);
 #endif // __linux__
-    this->srv.Post("/api/system/upload", api::system::upload);
+    this->srv.Post("/api/system/update/upload", api::system::update::upload);
+    this->srv.Post("/api/system/update/update", api::system::update::update);
+    this->srv.Get("/api/system/update/progress", api::system::update::progress);
 
     this->srv.Options("/(.*)", api::security::set_cors_headers);
 

src/settings/backup.cpp

@@ -21,9 +21,7 @@ namespace api
         void restore(const httplib::Request& request, httplib::Response& response)
         {
             std::size_t size = request.files.size();
-            std::cout << "file size::" << size << std::endl;
             bool ret = request.has_file("restore_settings");
-            std::cout << "file ret::" << ret << std::endl;
             const httplib::MultipartFormData& file = request.get_file_value("restore_settings");
             if (file.content_type == JSON_TYPE) {
                 nlohmann::json new_config = nlohmann::json::parse(file.content);

src/system/update/update.cpp

@@ -1,20 +1,52 @@
 #include <system/update/update.hpp>
 #include <types.hpp>
+#include <auth/auth.hpp>
+#include <filesystem>
+#include <colors.h>
 
 namespace api
 {
     namespace system
     {
-        void upload(const httplib::Request& request, httplib::Response& response) {
-            std::size_t size = request.files.size();
-            std::cout << "file size::" << size << std::endl;
-            bool ret = request.has_file("image");
-            std::cout << "file ret::" << ret << std::endl;
-            const httplib::MultipartFormData& file = request.get_file_value("restore_settings");
-            std::ofstream tmp_image_file("/tmp/image");
-            tmp_image_file << file.content;
-            tmp_image_file.close();
-            response.set_content(R"({"status":true})", JSON_TYPE);
+        namespace update
+        {
+            static int update_progress = 0;
+
+            void upload(const httplib::Request& request, httplib::Response& response)
+            {
+                std::cout << GREEN << request.path << RESET << "  " << request.method << std::endl;
+                bool ret = request.has_file("image");
+                if (!ret) {
+                    response.set_content(R"({"required":[token, file]})", JSON_TYPE);
+                }
+                bool has_token = request.has_file("token");
+                if (!has_token) {
+                    response.set_content(ACCESS_REQUIRED_STRING, JSON_TYPE);
+                    return;
+                }
+                if (!authenticate(request.get_file_value("token").content))
+                {
+                    response.set_content(R"({"access":"reject"})", JSON_TYPE);
+                    return;
+                }
+                const httplib::MultipartFormData& file = request.get_file_value("image");
+                std::ofstream tmp_image_file("/tmp/image");
+                tmp_image_file << file.content;
+                tmp_image_file.close();
+                response.set_content(R"({"status":true})", JSON_TYPE);
+            }
+
+            void update(const httplib::Request& request, httplib::Response& response)
+            {
+                std::cout << GREEN << request.path << RESET << "  " << request.method << std::endl;
+            }
+
+            void progress(const httplib::Request& request, httplib::Response& response)
+            {
+                std::cout << GREEN << request.path << RESET << "  " << request.method << std::endl;
+                std::string responsedata = R"({"progress":)" + std::to_string(update_progress) + "}";
+                response.set_content(responsedata, JSON_TYPE);
+            }
         }
     }
 }

src/system/update/update.hpp

@@ -6,8 +6,11 @@ namespace api
 {
     namespace system
     {
-        void upload(const httplib::Request& request, httplib::Response& response);
-        // void update(const httplib::Request& request, httplib::Response& response);
-        // void progress(const httplib::Request& request, httplib::Response& response);
+        namespace update
+        {
+            void upload(const httplib::Request& request, httplib::Response& response);
+            void update(const httplib::Request& request, httplib::Response& response);
+            void progress(const httplib::Request& request, httplib::Response& response);
+        }
     }
 }

src/system/uptime/uptime.cpp

@@ -15,10 +15,6 @@ namespace api
             struct sysinfo x;
             if (sysinfo(&x) == 0)
             {
-                // std::cout << static_cast<unsigned long long>(x.uptime)/3600ULL << "h "
-                //       << static_cast<unsigned long long>(x.uptime)/60ULL%60ULL << "m "
-                //       << static_cast<unsigned long long>(x.uptime)%60ULL << "s "
-                //       << std::endl;
                 std::stringstream responsedata;
                 responsedata << R"({"uptime":{"hour":")"
                     << static_cast<unsigned long long>(x.uptime) / 3600ULL

src/web/js/routes.js

@@ -21,7 +21,7 @@ const routes = {
     syslog: () => [host, prefix, "system", "syslog"].join("/"),
     uptime: () => [host, prefix, "system", "uptime"].join("/"),
 
-    upload_image: () => [host, prefix, "system", "upload"].join("/"),
-    update_image: () => [host, prefix, "system", "update"].join("/"),
-    update_progress: () => [host, prefix, "system", "progress"].join("/"),
+    upload_image: () => [host, prefix, "system", "update", "upload"].join("/"),
+    update_image: () => [host, prefix, "system", "update", "update"].join("/"),
+    update_progress: () => [host, prefix, "system", "update", "progress"].join("/"),
 };

src/web/js/update.js

@@ -28,8 +28,6 @@ checker.addEventListener("click", () => {
 
 upload_image_button.addEventListener("click", () => {
     upload_image_input.click();
-    update_block.classList.remove("hidden");
-    uploadprogress.classList.remove("hidden");
 });
 
 update_image_button.addEventListener("click", () => {
@@ -40,9 +38,10 @@ const upload_firmware_image = async () => {
     upload_percents.innerHTML = "Upload progress 0 %";
     upload_progress_bar.style.width = "0%";
     uploadprogress_block.classList.remove("hidden");
-    let image = update_firmware_input.files[0];
+    let image = upload_image_input.files[0];
     let formData = new FormData();
-    formData.append(image.name, image);
+    formData.append("image", image);
+    formData.append("token", localStorage.getItem('token'))
     var request = new XMLHttpRequest();
     request.upload.addEventListener("progress", (e) => {
         var file1Size = image.size;
@@ -59,25 +58,21 @@ const upload_firmware_image = async () => {
     });
     request.onreadystatechange = () => {
         if (request.readyState === 4) {
-            let jsondata = JSON.parse(request.responseText);
-            if (jsondata.success) {
-                image_table_body.innerHTML = `
-              <td><b>${jsondata.response.file.name}<b/></td>
-              <td>${(jsondata.response.file.size / 1024 / 1024).toFixed(2)}MB</td>
-              <td>${jsondata.response.cpu}</td>
-              <td>${jsondata.response.deviceName}</td>
-              <td>${jsondata.response.version}</td>
-              `;
-                image_table.classList.remove("hidden-table");
-                start_update_button.classList.remove("hidden-button");
+            console.log(request.responseText)
+            const jsondata = JSON.parse(request.responseText)
+            if (jsondata.status === true) {
+                update_image_button.classList.remove('hidden')
+                update_block.classList.remove("hidden");
+            } else {
+                notification('Upload error', 'error')
             }
         }
     };
     request.open(
         "post",
-        window.location.origin + "/wimic/updatefirmware/upload",
+        routes.upload_image(),
     );
-    request.timeout = 45000;
+    request.timeout = 450000;
     request.send(formData);
 };