detailed error messages api+front

kamilsss655 · kamilsss655 · commit 3bb8bfdfbf15 · 2024-04-25T15:48:04.000+02:00
diff --git a/frontend/src/components/system/FileUploader.vue b/frontend/src/components/system/FileUploader.vue
@@ -15,29 +15,34 @@
 
 <script setup lang="ts">
 import { Notify, QUploaderFactoryFn } from "quasar";
-import { ApiPaths } from "../../types/Api";
+import { ApiPaths, ApiResponse, GetApiResponseFromJson } from "../../types/Api";
+
+function onUploaded(info: {files: readonly any[], xhr: XMLHttpRequest}) {
+  const response: ApiResponse = GetApiResponseFromJson(info.xhr.response);
 
-function onUploaded() {
   Notify.create({
     type: "positive",
-    message: `Upload complete.`
+    message: response.data.response
   });
 }
 
 function onRejected(rejectedEntries: any) {
   console.log(rejectedEntries);
   Notify.create({
     type: "negative",
-    message: `${rejectedEntries.length} file(s) did not pass validation constraints`
+    message: `${rejectedEntries.length} file(s) did not pass validation constraints. File too big?`
   });
 }
 
-function onFailed(info: {files: readonly any[], xhr: any}) {
+function onFailed(info: {files: readonly any[], xhr: XMLHttpRequest}) {
   console.log(info.files);
   console.log(info.xhr);
+
+  const response: ApiResponse = GetApiResponseFromJson(info.xhr.response);
+
   Notify.create({
     type: "negative",
-    message: `Upload failed`
+    message: "Error! " + response.data.response
   });
 }
 
diff --git a/frontend/src/types/Api.ts b/frontend/src/types/Api.ts
@@ -5,11 +5,20 @@ export enum ApiPaths {
   Reboot = "/api/system/reboot",
   DeepSleep = "/api/system/deep_sleep",
   FactoryReset = "/api/system/factory_reset",
-  FileUpload ="/upload"
+  FileUpload = "/upload"
 }
 
 export interface ApiResponse {
   data: {
     response: string;
   };
 }
+
+// Convert JSON API response into ApiResponse
+export function GetApiResponseFromJson(jsonText: string): ApiResponse {
+  if (jsonText === "") {
+    return { data: { response: "" } };
+  } else {
+    return { data: { response: JSON.parse(jsonText).response } };
+  }
+}
diff --git a/main/storage/assets/index-KTzspj6P.js b/main/storage/assets/index-KTzspj6P.js
diff --git a/main/storage/index.html b/main/storage/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>ESPRI - ESP Radio Interface</title>
-    <script type="module" crossorigin src="/assets/index-KaZkwgZ2.js"></script>
+    <script type="module" crossorigin src="/assets/index-KTzspj6P.js"></script>
     <link rel="stylesheet" crossorigin href="/index-Iw26f.css">
   </head>
   <body>
diff --git a/main/web/handlers/static_files.c b/main/web/handlers/static_files.c
@@ -180,15 +180,15 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
     {
         /* Respond with 500 Internal Server Error */
         httpd_json_resp_send(req, HTTPD_500, "Filename too long");
-        return ESP_FAIL;
+        return ESP_OK;
     }
 
     /* Filename cannot have a trailing '/' */
     if (filename[strlen(filename) - 1] == '/')
     {
         ESP_LOGE(TAG, "Invalid filename : %s", filename);
         httpd_json_resp_send(req, HTTPD_500, "Invalid filename");
-        return ESP_FAIL;
+        return ESP_OK;
     }
 
 #ifdef UPLOAD_PREVENT_FILE_OVERWRITE
@@ -197,7 +197,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
         ESP_LOGE(TAG, "File already exists : %s", filepath);
         /* Respond with 400 Bad Request */
         httpd_json_resp_send(req, HTTPD_400, "File already exists");
-        return ESP_FAIL;
+        return ESP_OK;
     }
 #endif
 
@@ -206,10 +206,10 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
     {
         ESP_LOGE(TAG, "File too large : %d bytes", req->content_len);
         /* Respond with 400 Bad Request */
-        httpd_json_resp_send(req, HTTPD_400, "File size must be less than");
+        httpd_json_resp_send(req, HTTPD_400, "File size must be less than " MAX_FILE_SIZE_STR);
         /* Return failure to close underlying connection else the
          * incoming file content will keep the socket busy */
-        return ESP_FAIL;
+        return ESP_OK;
     }
 
 #ifdef UPLOAD_PREVENT_FILE_OVERWRITE
@@ -222,7 +222,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
     {
         ESP_LOGE(TAG, "Failed to get enough free space for the file");
         httpd_json_resp_send(req, HTTPD_500, "Failed to get enough free space for the file");
-        return ESP_FAIL;
+        return ESP_OK;
     }
 #endif
 
@@ -232,7 +232,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
         ESP_LOGE(TAG, "Failed to create file : %s", filepath);
         /* Respond with 500 Internal Server Error */
         httpd_json_resp_send(req, HTTPD_500, "Failed to create file");
-        return ESP_FAIL;
+        return ESP_OK;
     }
 
     ESP_LOGI(TAG, "Receiving file : %s...", filename);
@@ -266,7 +266,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
             ESP_LOGE(TAG, "File reception failed!");
             /* Respond with 500 Internal Server Error */
             httpd_json_resp_send(req, HTTPD_500, "Failed to receive file");
-            return ESP_FAIL;
+            return ESP_OK;
         }
 
         /* Write buffer content to file on storage */
@@ -280,7 +280,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)
             ESP_LOGE(TAG, "File write failed!");
             /* Respond with 500 Internal Server Error */
             httpd_json_resp_send(req, HTTPD_500, "Failed to write file to storage");
-            return ESP_FAIL;
+            return ESP_OK;
         }
 
         /* Keep track of remaining size of

Original file line number	Diff line number	Diff line change
`@@ -180,15 +180,15 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`180`	`180`	`{`
`181`	`181`	`/* Respond with 500 Internal Server Error */`
`182`	`182`	`httpd_json_resp_send(req, HTTPD_500, "Filename too long");`
`183`		`- return ESP_FAIL;`
	`183`	`+ return ESP_OK;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/* Filename cannot have a trailing '/' */`
`187`	`187`	`if (filename[strlen(filename) - 1] == '/')`
`188`	`188`	`{`
`189`	`189`	`ESP_LOGE(TAG, "Invalid filename : %s", filename);`
`190`	`190`	`httpd_json_resp_send(req, HTTPD_500, "Invalid filename");`
`191`		`- return ESP_FAIL;`
	`191`	`+ return ESP_OK;`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`#ifdef UPLOAD_PREVENT_FILE_OVERWRITE`
`@@ -197,7 +197,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`197`	`197`	`ESP_LOGE(TAG, "File already exists : %s", filepath);`
`198`	`198`	`/* Respond with 400 Bad Request */`
`199`	`199`	`httpd_json_resp_send(req, HTTPD_400, "File already exists");`
`200`		`- return ESP_FAIL;`
	`200`	`+ return ESP_OK;`
`201`	`201`	`}`
`202`	`202`	`#endif`
`203`	`203`
`@@ -206,10 +206,10 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`206`	`206`	`{`
`207`	`207`	`ESP_LOGE(TAG, "File too large : %d bytes", req->content_len);`
`208`	`208`	`/* Respond with 400 Bad Request */`
`209`		`- httpd_json_resp_send(req, HTTPD_400, "File size must be less than");`
	`209`	`+ httpd_json_resp_send(req, HTTPD_400, "File size must be less than " MAX_FILE_SIZE_STR);`
`210`	`210`	`/* Return failure to close underlying connection else the`
`211`	`211`	`* incoming file content will keep the socket busy */`
`212`		`- return ESP_FAIL;`
	`212`	`+ return ESP_OK;`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`#ifdef UPLOAD_PREVENT_FILE_OVERWRITE`
`@@ -222,7 +222,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`222`	`222`	`{`
`223`	`223`	`ESP_LOGE(TAG, "Failed to get enough free space for the file");`
`224`	`224`	`httpd_json_resp_send(req, HTTPD_500, "Failed to get enough free space for the file");`
`225`		`- return ESP_FAIL;`
	`225`	`+ return ESP_OK;`
`226`	`226`	`}`
`227`	`227`	`#endif`
`228`	`228`
`@@ -232,7 +232,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`232`	`232`	`ESP_LOGE(TAG, "Failed to create file : %s", filepath);`
`233`	`233`	`/* Respond with 500 Internal Server Error */`
`234`	`234`	`httpd_json_resp_send(req, HTTPD_500, "Failed to create file");`
`235`		`- return ESP_FAIL;`
	`235`	`+ return ESP_OK;`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`ESP_LOGI(TAG, "Receiving file : %s...", filename);`
`@@ -266,7 +266,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`266`	`266`	`ESP_LOGE(TAG, "File reception failed!");`
`267`	`267`	`/* Respond with 500 Internal Server Error */`
`268`	`268`	`httpd_json_resp_send(req, HTTPD_500, "Failed to receive file");`
`269`		`- return ESP_FAIL;`
	`269`	`+ return ESP_OK;`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`/* Write buffer content to file on storage */`
`@@ -280,7 +280,7 @@ esp_err_t STATIC_FILES_Upload(httpd_req_t *req)`
`280`	`280`	`ESP_LOGE(TAG, "File write failed!");`
`281`	`281`	`/* Respond with 500 Internal Server Error */`
`282`	`282`	`httpd_json_resp_send(req, HTTPD_500, "Failed to write file to storage");`
`283`		`- return ESP_FAIL;`
	`283`	`+ return ESP_OK;`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`/* Keep track of remaining size of`