Merge branch 'dev' into refactor/rework-css

CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
-## --- [4.4.1] - 2024/08/06
+## --- [4.4.4] - 2024/TBD
+### New features
+TBD
+### Bug fixes
+TBD
+### Tweaks
+TBD
+### Lang
+TBD
+<br><br>
 
+## --- [4.4.3] - 2024/08/08
+### Bug fixes
+- Fix schedules creation fail due to missing action ID ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/791))
+<br><br>
+
+## --- [4.4.2] - 2024/08/07
+### Bug fixes
+- Migrations | Fix exception message on file not found for backups migration ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/789))
+- UploadAPI | Upload chunks in batches to avoid overloading browser cache ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/788))
+<br><br>
+
+## --- [4.4.1] - 2024/08/06
 ### Patch Fixes
 - Migrations | Fix orphan backup configurations crashing migration operation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/785))
 - Migrations | Fix missing default configuration if no server backup config exists during the migration ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/785))

README.md

@@ -1,5 +1,5 @@
 [![Crafty Logo](app/frontend/static/assets/images/logo_long.svg)](https://craftycontrol.com)
-# Crafty Controller 4.4.1
+# Crafty Controller 4.4.4
 > Python based Control Panel for your Minecraft Server
 
 ## What is Crafty Controller?

app/classes/shared/tasks.py

@@ -341,7 +341,7 @@ class TasksManager:
             job_data["cron_string"],
             job_data["parent"],
             job_data["delay"],
-            job_data["action_id"],
+            job_data.get("action_id", None),
         )
 
         # Checks to make sure some doofus didn't actually make the newly
@@ -372,7 +372,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -399,7 +399,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -416,7 +416,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -436,7 +436,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -529,7 +529,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -553,7 +553,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -570,7 +570,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )
@@ -590,7 +590,7 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
+                                "action_id": job_data.get("action_id", None),
                             }
                         ],
                     )

app/config/version.json

@@ -1,5 +1,5 @@
 {
   "major": 4,
   "minor": 4,
-  "sub": 1
+  "sub": 4
 }

app/frontend/static/assets/js/shared/upload.js

@@ -1,67 +1,9 @@
-async function uploadFile(type, file = null, path = null, file_num = 0, _onProgress = null) {
+function delay(ms) {
-    if (file == null) {
+    return new Promise(resolve => setTimeout(resolve, ms));
-        try {
-            file = $("#file")[0].files[0];
-        } catch {
-            bootbox.alert("Please select a file first.")
-            return;
 }
 
-    }
+async function uploadChunk(file, url, chunk, start, end, chunk_hash, totalChunks, type, path, fileId, i, file_num, updateProgressBar) {
-    const fileId = uuidv4();
+    return fetch(url, {
-    const token = getCookie("_xsrf");
-    if (type !== "server_upload") {
-        document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div id="upload-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
-    }
-
-    let url = ``
-    if (type === "server_upload") {
-        url = `/api/v2/servers/${serverId}/files/upload/`;
-    } else if (type === "background") {
-        url = `/api/v2/crafty/admin/upload/`
-    } else if (type === "import") {
-        url = `/api/v2/servers/import/upload/`
-    }
-    console.log(url)
-    const chunkSize = 1024 * 1024 * 10; // 10MB
-    const totalChunks = Math.ceil(file.size / chunkSize);
-
-    const uploadPromises = [];
-    let errors = []; // Array to store errors
-    try {
-        let res = await fetch(url, {
-            method: 'POST',
-            headers: {
-                'X-XSRFToken': token,
-                'chunked': true,
-                'fileSize': file.size,
-                'type': type,
-                'totalChunks': totalChunks,
-                'fileName': file.name,
-                'location': path,
-                'fileId': fileId,
-            },
-            body: null,
-        });
-
-        if (!res.ok) {
-            let errorResponse = await res.json();
-            throw new Error(JSON.stringify(errorResponse));
-        }
-
-        let responseData = await res.json();
-
-        if (responseData.status !== "ok") {
-            throw new Error(JSON.stringify(responseData));
-        }
-
-        for (let i = 0; i < totalChunks; i++) {
-            const start = i * chunkSize;
-            const end = Math.min(start + chunkSize, file.size);
-            const chunk = file.slice(start, end);
-            const chunk_hash = await calculateFileHash(chunk);
-
-            const uploadPromise = fetch(url, {
         method: 'POST',
         body: chunk,
         headers: {
@@ -92,22 +34,98 @@ async function uploadFile(type, file = null, path = null, file_num = 0, _onProgr
             // Update progress bar
             const progress = (i + 1) / totalChunks * 100;
             updateProgressBar(Math.round(progress), type, file_num);
-                })
+        });
+}
+
+async function uploadFile(type, file = null, path = null, file_num = 0, _onProgress = null) {
+    if (file == null) {
+        try {
+            file = $("#file")[0].files[0];
+        } catch {
+            bootbox.alert("Please select a file first.");
+            return;
+        }
+    }
+
+    const fileId = uuidv4();
+    const token = getCookie("_xsrf");
+    if (type !== "server_upload") {
+        document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div id="upload-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
+    }
+
+    let url = '';
+    if (type === "server_upload") {
+        url = `/api/v2/servers/${serverId}/files/upload/`;
+    } else if (type === "background") {
+        url = `/api/v2/crafty/admin/upload/`;
+    } else if (type === "import") {
+        url = `/api/v2/servers/import/upload/`;
+    }
+    console.log(url);
+
+    const chunkSize = 1024 * 1024 * 10; // 10MB
+    const totalChunks = Math.ceil(file.size / chunkSize);
+
+    const errors = [];
+    const batchSize = 30; // Number of chunks to upload in each batch
+
+    try {
+        let res = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'X-XSRFToken': token,
+                'chunked': true,
+                'fileSize': file.size,
+                'type': type,
+                'totalChunks': totalChunks,
+                'fileName': file.name,
+                'location': path,
+                'fileId': fileId,
+            },
+            body: null,
+        });
+
+        if (!res.ok) {
+            let errorResponse = await res.json();
+            throw new Error(JSON.stringify(errorResponse));
+        }
+
+        let responseData = await res.json();
+
+        if (responseData.status !== "ok") {
+            throw new Error(JSON.stringify(responseData));
+        }
+
+        for (let i = 0; i < totalChunks; i += batchSize) {
+            const batchPromises = [];
+
+            for (let j = 0; j < batchSize && (i + j) < totalChunks; j++) {
+                const start = (i + j) * chunkSize;
+                const end = Math.min(start + chunkSize, file.size);
+                const chunk = file.slice(start, end);
+                const chunk_hash = await calculateFileHash(chunk);
+
+                const uploadPromise = uploadChunk(file, url, chunk, start, end, chunk_hash, totalChunks, type, path, fileId, i + j, file_num, updateProgressBar)
                     .catch(error => {
                         errors.push(error); // Store the error
                     });
 
-            uploadPromises.push(uploadPromise);
+                batchPromises.push(uploadPromise);
             }
 
-        await Promise.all(uploadPromises);
+            // Wait for the current batch to complete before proceeding to the next batch
+            await Promise.all(batchPromises);
+
+            // Optional delay between batches to account for rate limiting
+            await delay(2000); // Adjust the delay time (in milliseconds) as needed
+        }
     } catch (error) {
         errors.push(error); // Store the error
     }
 
     if (errors.length > 0) {
         const errorMessage = errors.map(error => JSON.parse(error.message).data.message || 'Unknown error occurred').join('<br>');
-        console.log(errorMessage)
+        console.log(errorMessage);
         bootbox.alert({
             title: 'Error',
             message: errorMessage,

app/migrations/20240308_multi-backup.py

@@ -207,7 +207,7 @@ def migrate(migrator: Migrator, database, **kwargs):
                     )
         except FileNotFoundError as why:
             logger.error(
-                f"Could not move backup {file} for {server.server_name} to new location with error {why}"
+                f"Could not move backups for {server.server_name} to new location with error {why}"
             )
 
     Console.debug("Migrations: Dropping old backup table")

sonar-project.properties

@@ -3,7 +3,7 @@ sonar.organization=crafty-controller
 
 # This is the name and version displayed in the SonarCloud UI.
 sonar.projectName=Crafty 4
-sonar.projectVersion=4.4.1
+sonar.projectVersion=4.4.4
 sonar.python.version=3.9, 3.10, 3.11
 sonar.exclusions=app/migrations/**, app/frontend/static/assets/vendors/**