From 9c7de22c3a3c88702d54a3d9dc70052022cddfe2 Mon Sep 17 00:00:00 2001
From: xRangerDE <xRangerDE@24-music.de>
Date: Sat, 21 Feb 2026 01:01:16 +0100
Subject: [PATCH] Always surface latest available update version across checks
 (v4.1.12)

---
 typescript-version/package-lock.json |   4 +-
 typescript-version/package.json      |   2 +-
 typescript-version/src/index.html    |   4 +-
 typescript-version/src/main.ts       | 102 ++++++++++++++++++++++++---
 4 files changed, 97 insertions(+), 15 deletions(-)

diff --git a/typescript-version/package-lock.json b/typescript-version/package-lock.json
index 21c13ea..9f97f14 100644
--- a/typescript-version/package-lock.json
+++ b/typescript-version/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "twitch-vod-manager",
-  "version": "4.1.11",
+  "version": "4.1.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "twitch-vod-manager",
-      "version": "4.1.11",
+      "version": "4.1.12",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.6.0",
diff --git a/typescript-version/package.json b/typescript-version/package.json
index 32cb338..f705958 100644
--- a/typescript-version/package.json
+++ b/typescript-version/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twitch-vod-manager",
-  "version": "4.1.11",
+  "version": "4.1.12",
   "description": "Twitch VOD Manager - Download Twitch VODs easily",
   "main": "dist/main.js",
   "author": "xRangerDE",
diff --git a/typescript-version/src/index.html b/typescript-version/src/index.html
index 23fdfa5..e1847dd 100644
--- a/typescript-version/src/index.html
+++ b/typescript-version/src/index.html
@@ -457,7 +457,7 @@
 
                     <div class="settings-card">
                         <h3 id="updateTitle">Updates</h3>
-                        <p id="versionInfo" style="margin-bottom: 10px; color: var(--text-secondary);">Version: v4.1.11</p>
+                        <p id="versionInfo" style="margin-bottom: 10px; color: var(--text-secondary);">Version: v4.1.12</p>
                         <button class="btn-secondary" id="checkUpdateBtn" onclick="checkUpdate()">Nach Updates suchen</button>
                     </div>
 
@@ -502,7 +502,7 @@
                     <div class="status-dot" id="statusDot"></div>
                     <span id="statusText">Nicht verbunden</span>
                 </div>
-                <span id="versionText">v4.1.11</span>
+                <span id="versionText">v4.1.12</span>
             </div>
         </main>
     </div>
diff --git a/typescript-version/src/main.ts b/typescript-version/src/main.ts
index 7afa57d..e7051bb 100644
--- a/typescript-version/src/main.ts
+++ b/typescript-version/src/main.ts
@@ -8,7 +8,7 @@ import { autoUpdater } from 'electron-updater';
 // ==========================================
 // CONFIG & CONSTANTS
 // ==========================================
-const APP_VERSION = '4.1.11';
+const APP_VERSION = '4.1.12';
 const UPDATE_CHECK_URL = 'http://24-music.de/version.json';
 
 // Paths
@@ -403,6 +403,8 @@ let autoUpdateCheckInProgress = false;
 let autoUpdateReadyToInstall = false;
 let autoUpdateDownloadInProgress = false;
 let lastAutoUpdateCheckAt = 0;
+let latestKnownUpdateVersion: string | null = null;
+let downloadedUpdateVersion: string | null = null;
 let twitchLoginInFlight: Promise<boolean> | null = null;
 
 // ==========================================
@@ -2921,6 +2923,12 @@ function createWindow(): void {
         if (isDownloading) {
             mainWindow?.webContents.send('download-started');
         }
+
+        if (autoUpdateReadyToInstall && downloadedUpdateVersion) {
+            mainWindow?.webContents.send('update-downloaded', {
+                version: downloadedUpdateVersion
+            });
+        }
     });
 
     mainWindow.on('closed', () => {
@@ -2936,11 +2944,48 @@ function createWindow(): void {
 // ==========================================
 // AUTO-UPDATER (electron-updater)
 // ==========================================
-async function requestUpdateCheck(source: UpdateCheckSource, force = false): Promise<{ started: boolean; reason?: string }> {
-    if (autoUpdateReadyToInstall) {
-        return { started: false, reason: 'ready-to-install' };
+function normalizeUpdateVersion(version: string | null | undefined): string {
+    return (version || '').trim().replace(/^v/i, '');
+}
+
+function compareUpdateVersions(left: string | null | undefined, right: string | null | undefined): number {
+    const a = normalizeUpdateVersion(left);
+    const b = normalizeUpdateVersion(right);
+
+    if (!a && !b) return 0;
+    if (!a) return -1;
+    if (!b) return 1;
+
+    const aParts = a.split('.').map((part) => {
+        const numeric = Number(part.replace(/[^0-9].*$/, ''));
+        return Number.isFinite(numeric) ? numeric : 0;
+    });
+
+    const bParts = b.split('.').map((part) => {
+        const numeric = Number(part.replace(/[^0-9].*$/, ''));
+        return Number.isFinite(numeric) ? numeric : 0;
+    });
+
+    const maxLength = Math.max(aParts.length, bParts.length);
+    for (let i = 0; i < maxLength; i += 1) {
+        const av = aParts[i] || 0;
+        const bv = bParts[i] || 0;
+        if (av > bv) return 1;
+        if (av < bv) return -1;
     }
 
+    return 0;
+}
+
+function hasNewerKnownUpdateThanDownloaded(): boolean {
+    if (!latestKnownUpdateVersion || !downloadedUpdateVersion) {
+        return false;
+    }
+
+    return compareUpdateVersions(latestKnownUpdateVersion, downloadedUpdateVersion) > 0;
+}
+
+async function requestUpdateCheck(source: UpdateCheckSource, force = false): Promise<{ started: boolean; reason?: string }> {
     if (autoUpdateCheckInProgress) {
         return { started: false, reason: 'in-progress' };
     }
@@ -2983,7 +3028,7 @@ async function requestUpdateCheck(source: UpdateCheckSource, force = false): Pro
 }
 
 async function requestUpdateDownload(source: UpdateDownloadSource): Promise<{ started: boolean; reason?: string }> {
-    if (autoUpdateReadyToInstall) {
+    if (autoUpdateReadyToInstall && !hasNewerKnownUpdateThanDownloaded()) {
         return { started: false, reason: 'ready-to-install' };
     }
 
@@ -3054,12 +3099,44 @@ function setupAutoUpdater() {
     });
 
     autoUpdater.on('update-available', (info) => {
-        console.log('Update available:', info.version);
-        autoUpdateReadyToInstall = false;
+        const incomingVersion = normalizeUpdateVersion(info.version);
+        const displayVersion = incomingVersion || info.version;
+
+        if (latestKnownUpdateVersion && compareUpdateVersions(incomingVersion, latestKnownUpdateVersion) < 0) {
+            appendDebugLog('update-available-ignored-older', {
+                incomingVersion: displayVersion,
+                knownVersion: latestKnownUpdateVersion
+            });
+            return;
+        }
+
+        latestKnownUpdateVersion = incomingVersion || latestKnownUpdateVersion;
+
+        const hasAlreadyDownloadedThisVersion = Boolean(
+            autoUpdateReadyToInstall &&
+            downloadedUpdateVersion &&
+            compareUpdateVersions(downloadedUpdateVersion, incomingVersion) === 0
+        );
+
+        console.log('Update available:', displayVersion);
+        if (!hasAlreadyDownloadedThisVersion) {
+            autoUpdateReadyToInstall = false;
+        }
+
         autoUpdateDownloadInProgress = false;
+
+        if (hasAlreadyDownloadedThisVersion) {
+            if (mainWindow) {
+                mainWindow.webContents.send('update-downloaded', {
+                    version: displayVersion
+                });
+            }
+            return;
+        }
+
         if (mainWindow) {
             mainWindow.webContents.send('update-available', {
-                version: info.version,
+                version: displayVersion,
                 releaseDate: info.releaseDate
             });
         }
@@ -3087,12 +3164,17 @@ function setupAutoUpdater() {
     });
 
     autoUpdater.on('update-downloaded', (info) => {
-        console.log('Update downloaded:', info.version);
+        const downloadedVersion = normalizeUpdateVersion(info.version) || info.version;
+        console.log('Update downloaded:', downloadedVersion);
         autoUpdateReadyToInstall = true;
         autoUpdateDownloadInProgress = false;
+        downloadedUpdateVersion = downloadedVersion;
+        if (!latestKnownUpdateVersion || compareUpdateVersions(downloadedVersion, latestKnownUpdateVersion) > 0) {
+            latestKnownUpdateVersion = downloadedVersion;
+        }
         if (mainWindow) {
             mainWindow.webContents.send('update-downloaded', {
-                version: info.version
+                version: downloadedVersion
             });
         }
     });