Auto-clear stale updater state

manifests/manifest-dev.json

@@ -1,9 +1,9 @@
 {
-  "version": "0.1.3-dev1",
+  "version": "0.1.3-dev3",
-  "_release_date": "2025-12-14T22:23:00Z",
+  "_release_date": "2025-12-14T23:50:00Z",
-  "bundle": "https://git.44r0n.cc/44r0n7/pi-kit/releases/download/v0.1.3-dev1/pikit-0.1.3-dev1.tar.gz",
+  "bundle": "https://git.44r0n.cc/44r0n7/pi-kit/releases/download/v0.1.3-dev3/pikit-0.1.3-dev3.tar.gz",
-  "changelog": "https://git.44r0n.cc/44r0n7/pi-kit/releases/download/v0.1.3-dev1/CHANGELOG-0.1.3-dev1.txt",
+  "changelog": "https://git.44r0n.cc/44r0n7/pi-kit/releases/download/v0.1.3-dev3/CHANGELOG-0.1.3-dev3.txt",
   "files": [
-    { "path": "bundle.tar.gz", "sha256": "290bc3ef0acbac8ffc1d283fdf5413bdd0dd6a90a9ccd2253dfd406773951b62" }
+    { "path": "bundle.tar.gz", "sha256": "1352f6a90d91e21871684e9a2c175c8cb48c53aa0b121fcdc94a3004c3d4d3f2" }
   ]
 }

pikit-web/data/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.3-dev1"
+  "version": "0.1.3-dev3"
 }

pikit_api/releases.py

@@ -43,29 +43,62 @@ def read_current_version() -> str:
 
 def load_update_state() -> Dict[str, Any]:
     UPDATE_STATE_DIR.mkdir(parents=True, exist_ok=True)
+    def _reset_if_stale(state: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        If state thinks an update is running but the lock holder is gone,
+        clear it so the UI can recover instead of getting stuck forever.
+        """
+        lock_alive = False
+        if UPDATE_LOCK.exists():
+            try:
+                pid = int(UPDATE_LOCK.read_text().strip() or "0")
+                if pid > 0:
+                    os.kill(pid, 0)
+                    lock_alive = True
+                else:
+                    UPDATE_LOCK.unlink(missing_ok=True)
+            except OSError:
+                UPDATE_LOCK.unlink(missing_ok=True)
+            except Exception:
+                UPDATE_LOCK.unlink(missing_ok=True)
+
+        if state.get("in_progress") and not lock_alive:
+            state["in_progress"] = False
+            state["progress"] = None
+            if state.get("status") == "in_progress":
+                state["status"] = "up_to_date"
+            state["message"] = state.get("message") or "Recovered from interrupted update"
+            try:
+                save_update_state(state)
+            except Exception:
+                pass
+        return state
+
     if UPDATE_STATE.exists():
         try:
             state = json.loads(UPDATE_STATE.read_text())
             state.setdefault("changelog_url", None)
             state.setdefault("latest_release_date", None)
             state.setdefault("current_release_date", None)
-            return state
+            return _reset_if_stale(state)
         except Exception:
             pass
-    return {
+    return _reset_if_stale(
-        "current_version": read_current_version(),
+        {
-        "latest_version": None,
+            "current_version": read_current_version(),
-        "last_check": None,
+            "latest_version": None,
-        "status": "unknown",
+            "last_check": None,
-        "message": "",
+            "status": "unknown",
-        "auto_check": False,
+            "message": "",
-        "in_progress": False,
+            "auto_check": False,
-        "progress": None,
+            "in_progress": False,
-        "channel": os.environ.get("PIKIT_CHANNEL", "dev"),
+            "progress": None,
-        "changelog_url": None,
+            "channel": os.environ.get("PIKIT_CHANNEL", "dev"),
-        "latest_release_date": None,
+            "changelog_url": None,
-        "current_release_date": None,
+            "latest_release_date": None,
-    }
+            "current_release_date": None,
+        }
+    )
 
 
 def save_update_state(state: Dict[str, Any]) -> None:
@@ -400,6 +433,19 @@ def fetch_text_with_auth(url: str):
 def acquire_lock():
     try:
         ensure_dir(UPDATE_LOCK.parent)
+        # Clear stale lock if the recorded PID is not running
+        if UPDATE_LOCK.exists():
+            try:
+                pid = int(UPDATE_LOCK.read_text().strip() or "0")
+                if pid > 0:
+                    os.kill(pid, 0)
+                else:
+                    UPDATE_LOCK.unlink(missing_ok=True)
+            except OSError:
+                # Process not running
+                UPDATE_LOCK.unlink(missing_ok=True)
+            except Exception:
+                UPDATE_LOCK.unlink(missing_ok=True)
         lockfile = UPDATE_LOCK.open("w")
         fcntl.flock(lockfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
         lockfile.write(str(os.getpid()))
@@ -523,8 +569,9 @@ def _install_manifest(manifest: Dict[str, Any], meta: Optional[Dict[str, Any]],
         shutil.rmtree(API_PACKAGE_DIR, ignore_errors=True)
         shutil.copytree(staged_pkg, API_PACKAGE_DIR, dirs_exist_ok=True)
 
-    for svc in ("pikit-api.service", "dietpi-dashboard-frontend.service"):
+    # Restart frontend to pick up new assets; avoid restarting this API process
-        subprocess.run(["systemctl", "restart", svc], check=False)
+    # mid-apply to prevent leaving state in_progress.
+    subprocess.run(["systemctl", "restart", "dietpi-dashboard-frontend.service"], check=False)
 
     VERSION_FILE.parent.mkdir(parents=True, exist_ok=True)
     VERSION_FILE.write_text(str(latest))