feat: Enhance WebUI and boot package handling in version 2.1.1

- Fixed bashisms in the boot image generator script for improved compatibility.
- Styled boot image generation buttons for better user experience.
- Added an explicit button for boot image generation in the WebUI.
- Resolved navigation hangs on AJAX pages to enhance responsiveness.
- Updated boot package status handling to reflect accurate states and improve user feedback.

Author: tdewey-rpi

debian/changelog

@@ -1,3 +1,12 @@
+rpi-sb-provisioner (2.1.1) unstable; urgency=medium
+
+  * WebUI: Fix bootimg generator bashisms
+  * WebUI: Style bootimg generator buttons
+  * WebUI: Add explicit bootimg generation button
+  * WebUI: Fix hangs on navigation on pages using AJAX
+
+  -- Tom Dewey <[email protected]>  Fri, 10 Oct 2025 16:45:00 +0100
+
 rpi-sb-provisioner (2.1.0) unstable; urgency=medium
 
   * Features:

provisioner-service/src/images.cpp

@@ -263,8 +263,8 @@ class BootPackageWebSocketController : public drogon::WebSocketController<BootPa
                 response["status"] = "available";
                 LOG_INFO << "WebSocket: Broadcasting boot package available for " << imageName << ": " << packageName;
             } else {
-                response["status"] = "generating";
-                LOG_INFO << "WebSocket: Broadcasting boot package generating for " << imageName;
+                response["status"] = "not_found";
+                LOG_INFO << "WebSocket: Broadcasting boot package not found for " << imageName;
             }
 
             std::string message = response.toStyledString();
@@ -910,6 +910,9 @@ namespace provisioner {
             } else {
                 LOG_INFO << "Started boot.img generation service: " << serviceName;
             }
+            
+            // Broadcast "generating" status to WebSocket clients
+            BootPackageWebSocketController::broadcastUpdate(imageName, false, "", "generating");
         }
 
         // Cleanup
@@ -1582,6 +1585,18 @@ namespace provisioner {
                 return;
             }
 
+            // Check if provisioning style is secure-boot (boot packages only work in secure-boot mode)
+            auto provisioningStyle = provisioner::utils::getConfigValue("PROVISIONING_STYLE");
+            if (!provisioningStyle || *provisioningStyle != "secure-boot") {
+                Json::Value result;
+                result["exists"] = false;
+                result["image_name"] = imageName;
+                result["status"] = "unsupported";
+                auto resp = drogon::HttpResponse::newHttpJsonResponse(result);
+                callback(resp);
+                return;
+            }
+            
             // Remove file extension from image name to get base name
             std::string imageBaseName = imageName;
             size_t dotPos = imageBaseName.find_last_of('.');
@@ -1595,6 +1610,7 @@ namespace provisioner {
             Json::Value result;
             result["exists"] = false;
             result["image_name"] = imageName;
+            result["status"] = "not_found";
 
             try {
                 if (std::filesystem::exists(outputDir) && std::filesystem::is_directory(outputDir)) {
@@ -1611,6 +1627,7 @@ namespace provisioner {
                                 result["exists"] = true;
                                 result["package_name"] = filename;
                                 result["package_path"] = entry.path().string();
+                                result["status"] = "available";
                                 break;
                             }
                         }

provisioner-service/src/views/images.csp

@@ -605,7 +605,7 @@
                 cell.innerHTML = `<span style="color: #666;" title="Boot packages are only available in secure-boot provisioning mode">Unsupported</span>`;
                 pendingBootPackageRequests.delete(imageName);
             } else if (response.exists && response.package_name) {
-                cell.innerHTML = `<a href="/download-boot-package?name=${encodeURIComponent(imageName)}" class="download-link" download>Download ${response.package_name}</a>`;
+                cell.innerHTML = `<a href="/download-boot-package?name=${encodeURIComponent(imageName)}" class="download-link" download title="${response.package_name}">Download</a>`;
                 pendingBootPackageRequests.delete(imageName);
 
                 // Clear any polling interval for this image
@@ -627,6 +627,24 @@
             }
         }
 
+        // Fetch boot package status via HTTP (explicit status fetch)
+        async function fetchBootPackageStatus(imageName) {
+            try {
+                const response = await fetch(`/get-boot-package-info?name=${encodeURIComponent(imageName)}`);
+                if (response.ok) {
+                    const data = await response.json();
+                    updateBootPackageCell(data);
+                    return data;
+                } else {
+                    console.error('Failed to fetch boot package status for:', imageName);
+                    return null;
+                }
+            } catch (error) {
+                console.error('Error fetching boot package status:', error);
+                return null;
+            }
+        }
+        
         // Request boot package status via WebSocket
         function requestBootPackage(imageName) {
             if (!wsBootPackage || wsBootPackage.readyState !== WebSocket.OPEN) {
@@ -660,12 +678,65 @@
             });
         }
 
+        // Setup long-interval polling for boot packages (fallback mechanism)
+        function setupBootPackagePolling() {
+            // Clear any existing polling interval
+            if (window.bootPackageLongPoll) {
+                clearInterval(window.bootPackageLongPoll);
+            }
+            
+            // Poll every 30 seconds as a fallback
+            window.bootPackageLongPoll = setInterval(() => {
+                const bootPackageCells = document.querySelectorAll('.boot-package-cell');
+                bootPackageCells.forEach(cell => {
+                    const imageName = cell.getAttribute('data-image');
+                    if (imageName) {
+                        fetchBootPackageStatus(imageName);
+                    }
+                });
+            }, 30000); // 30 seconds
+        }
+        
         // Check all boot packages on page load
         function checkAllBootPackages() {
-            // WebSocket will handle this when connected
+            // Explicitly fetch status for all images on load
+            const bootPackageCells = document.querySelectorAll('.boot-package-cell');
+            bootPackageCells.forEach(cell => {
+                const imageName = cell.getAttribute('data-image');
+                if (imageName) {
+                    fetchBootPackageStatus(imageName);
+                }
+            });
+            
+            // Setup long-interval polling as fallback
+            setupBootPackagePolling();
+            
+            // Also initialize WebSocket for real-time updates
             initBootPackageWebSocket();
         }
 
+        // Cleanup function to be called when navigating away
+        function cleanupBootPackagePolling() {
+            // Clear long-interval polling
+            if (window.bootPackageLongPoll) {
+                clearInterval(window.bootPackageLongPoll);
+                window.bootPackageLongPoll = null;
+            }
+            
+            // Clear all per-image intervals
+            if (window.bootPackageIntervals) {
+                Object.values(window.bootPackageIntervals).forEach(interval => {
+                    clearInterval(interval);
+                });
+                window.bootPackageIntervals = {};
+            }
+            
+            // Close WebSocket
+            if (wsBootPackage && wsBootPackage.readyState === WebSocket.OPEN) {
+                wsBootPackage.close();
+            }
+        }
+        
         // Initialize SHA256 requests for all images
         function initializeSha256Requests() {
             if (!ws || ws.readyState !== WebSocket.OPEN) {
@@ -761,6 +832,7 @@
             pendingBootPackageRequests.clear();
             // Stop all polling
             stopAllPolling();
+            cleanupBootPackagePolling();
             // Force close WebSockets with timeout
             forceCloseWebSocket();
             if (wsBootPackage) {
@@ -773,8 +845,10 @@
             console.log('Page hidden - cleaning up WebSocket and polling');
             // Clear all pending requests first
             pendingSha256Requests.clear();
+            pendingBootPackageRequests.clear();
             // Stop all polling
             stopAllPolling();
+            cleanupBootPackagePolling();
             // Force close WebSocket with timeout
             forceCloseWebSocket();
         });
@@ -997,14 +1071,21 @@
 
         /* Boot package download link styles */
         .download-link {
-            color: #0066cc;
+            display: inline-block;
+            padding: 6px 12px;
+            background-color: #2196F3;
+            color: white;
             text-decoration: none;
             font-weight: 500;
+            border-radius: 3px;
+            font-size: 14px;
+            cursor: pointer;
+            border: none;
         }
 
         .download-link:hover {
-            text-decoration: underline;
-            color: #0052a3;
+            background-color: #0b7dda;
+            text-decoration: none;
         }
 
         .boot-package-cell {