From d2c3edea2f6adbf5e541d9fc5fac1ddd7ada056d Mon Sep 17 00:00:00 2001
From: EduBox Dev <dev@edubox.local>
Date: Sun, 28 Jun 2026 20:03:49 +0000
Subject: [PATCH] agent v0.3.17: correction statut Tailscale + overlay de
 reconnexion pendant l'update

---
 agent/VERSION       |  2 +-
 agent/tailscale.go  |  8 ++---
 agent/ui/index.html | 73 +++++++++++++++++++++++++++++++++++----------
 3 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/agent/VERSION b/agent/VERSION
index ec96a62..e5a9958 100644
--- a/agent/VERSION
+++ b/agent/VERSION
@@ -1 +1 @@
-0.3.16
+0.3.17
diff --git a/agent/tailscale.go b/agent/tailscale.go
index 91135ef..41a1644 100644
--- a/agent/tailscale.go
+++ b/agent/tailscale.go
@@ -214,12 +214,10 @@ func getTailscaleIP() string {
 }
 
 // isTailscaleReady reports whether tailscaled is running and has successfully
-// joined the tailnet (i.e. it has a Tailscale IP). This is a stronger check
-// than isTailscaleRunning which only verifies the process exists.
+// joined the tailnet (i.e. it has a Tailscale IP). It does not rely on
+// isTailscaleRunning because tailscaled may have been started by a previous
+// agent run or externally; the important thing is that the socket responds.
 func isTailscaleReady() bool {
-	if !isTailscaleRunning() {
-		return false
-	}
 	tsCmdMu.Lock()
 	socket := tsSocket
 	tsCmdMu.Unlock()
diff --git a/agent/ui/index.html b/agent/ui/index.html
index f05170f..8c8ab47 100644
--- a/agent/ui/index.html
+++ b/agent/ui/index.html
@@ -608,9 +608,10 @@
   </div>
 
   <script>
-    const ws = new WebSocket('ws://' + location.host + '/ws');
+    let ws;
     let currentView = 'activation';
     let studentName = '';
+    let updateInProgress = false;
     const instanceProgress = {}; // instanceId -> { percent, message }
 
     const views = {
@@ -628,23 +629,39 @@
       }
     }
 
-    ws.onopen = () => {
-      ws.send(JSON.stringify({action: 'check'}));
-      ws.send(JSON.stringify({action: 'get_status'}));
-    };
+    function connectWebSocket() {
+      ws = new WebSocket('ws://' + location.host + '/ws');
 
-    ws.onmessage = (ev) => {
-      const msg = JSON.parse(ev.data);
-      handleMessage(msg);
-    };
+      ws.onopen = () => {
+        if (updateInProgress) {
+          hideUpdateOverlay();
+          updateInProgress = false;
+        }
+        ws.send(JSON.stringify({action: 'check'}));
+        ws.send(JSON.stringify({action: 'get_status'}));
+      };
 
-    ws.onclose = () => {
-      showView('disconnected');
-    };
+      ws.onmessage = (ev) => {
+        const msg = JSON.parse(ev.data);
+        handleMessage(msg);
+      };
 
-    ws.onerror = () => {
-      showView('disconnected');
-    };
+      ws.onclose = () => {
+        if (updateInProgress) {
+          setTimeout(connectWebSocket, 2000);
+        } else {
+          showView('disconnected');
+        }
+      };
+
+      ws.onerror = () => {
+        if (!updateInProgress) {
+          showView('disconnected');
+        }
+      };
+    }
+
+    connectWebSocket();
 
     function handleMessage(msg) {
       switch (msg.action) {
@@ -968,16 +985,31 @@
           </div>
         </div>
       `;
+      document.getElementById('update-overlay-bar').style.width = pct + '%';
+      document.getElementById('update-overlay-message').textContent = message || 'Mise à jour en cours...';
+    }
+
+    function showUpdateOverlay() {
+      updateInProgress = true;
+      document.getElementById('update-overlay').classList.remove('hidden');
+    }
+
+    function hideUpdateOverlay() {
+      updateInProgress = false;
+      document.getElementById('update-overlay').classList.add('hidden');
     }
 
     async function startAgentUpdate() {
+      showUpdateOverlay();
       showUpdateProgress('10', 'Préparation de la mise à jour...');
       try {
         const res = await fetch('/api/update', {method: 'POST'});
         if (!res.ok) {
+          hideUpdateOverlay();
           showUpdateProgress('0', 'Erreur ' + res.status);
         }
       } catch (err) {
+        hideUpdateOverlay();
         showUpdateProgress('0', escapeHtml(err.message));
       }
     }
@@ -1044,5 +1076,16 @@
         .replace(/'/g, '&#039;');
     }
   </script>
+
+  <!-- Update in progress overlay -->
+  <div id="update-overlay" class="hidden" style="position: fixed; inset: 0; background: rgba(0,0,0,0.85); display: flex; align-items: center; justify-content: center; z-index: 1000;">
+    <div class="card" style="max-width: 400px; text-align: center;">
+      <div class="service-icon" style="background: var(--info); margin: 0 auto 1rem; width: 48px; height: 48px; font-size: 1.5rem;"><span class="spin">↻</span></div>
+      <h2>Mise à jour en cours</h2>
+      <p class="subtitle">L'agent se redémarre. Cette page se reconnectera automatiquement.</p>
+      <div class="progress-bar"><div id="update-overlay-bar" style="width: 0%"></div></div>
+      <p id="update-overlay-message" class="service-detail" style="margin-top: 0.75rem;">Préparation...</p>
+    </div>
+  </div>
 </body>
 </html>