feat: enhance update checker with startup delay and improved error handling

rgdevment · rgdevment · commit 0de03aa4f762 · 2026-02-09T21:19:31.000-03:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -362,6 +362,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
+          generate_release_notes: true
           files: |
             CopyPaste-${{ steps.get_version.outputs.VERSION }}-${{ matrix.arch }}-setup.exe
         env:
@@ -506,14 +507,15 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # ─── Microsoft Store Submission ──────────────────────────────────────────
-  # DISABLED: First Store submission must be done manually via Partner Center.
-  # To re-enable: change the 'if' condition below to:
-  #   if: startsWith(github.ref, 'refs/tags/')
+  # Automatically submits MSIX packages to the Microsoft Store.
+  # Only runs on stable version tags (no pre-release).
+  # Requires these GitHub secrets: STORE_TENANT_ID, STORE_CLIENT_ID, STORE_CLIENT_SECRET
+  # And this GitHub variable: STORE_APP_ID
   store-publish:
     runs-on: windows-latest
     needs: store
     timeout-minutes: 15
-    if: false # Disabled until first manual Store submission is approved
+    if: false #startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')
 
     env:
       STORE_TENANT_ID: ${{ secrets.STORE_TENANT_ID }}
@@ -545,6 +547,57 @@ jobs:
             echo "HAS_CREDS=true" >> $env:GITHUB_OUTPUT
           }
 
+      - name: Extract version from tag
+        if: steps.check_creds.outputs.HAS_CREDS == 'true'
+        id: get_version
+        shell: pwsh
+        run: |
+          if ($env:GITHUB_REF -match 'refs/tags/v(.+)') {
+            $version = $matches[1]
+          } else {
+            $version = "1.0.0"
+          }
+          echo "VERSION=$version" >> $env:GITHUB_OUTPUT
+
+      - name: Get release notes from GitHub Release
+        if: steps.check_creds.outputs.HAS_CREDS == 'true'
+        id: release_notes
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          $tag = "v${{ steps.get_version.outputs.VERSION }}"
+          $headers = @{
+            "Authorization" = "token $env:GH_TOKEN"
+            "Accept" = "application/vnd.github.v3+json"
+          }
+
+          try {
+            $release = Invoke-RestMethod `
+              -Uri "https://api.github.com/repos/${{ github.repository }}/releases/tags/$tag" `
+              -Headers $headers
+
+            $body = $release.body
+            if ([string]::IsNullOrWhiteSpace($body)) {
+              $body = "Bug fixes and improvements."
+            }
+
+            # Store listing 'What's new' supports max 1500 characters
+            if ($body.Length -gt 1500) {
+              $body = $body.Substring(0, 1497) + "..."
+            }
+
+            # Write multiline output using heredoc delimiter (GitHub Actions recommended)
+            $delimiter = "RELEASE_NOTES_EOF"
+            echo "NOTES<<$delimiter" >> $env:GITHUB_OUTPUT
+            echo $body >> $env:GITHUB_OUTPUT
+            echo $delimiter >> $env:GITHUB_OUTPUT
+            Write-Host "Release notes extracted ($($body.Length) chars)"
+          } catch {
+            Write-Warning "Failed to fetch release notes: $($_.Exception.Message)"
+            echo "NOTES=Bug fixes and improvements." >> $env:GITHUB_OUTPUT
+          }
+
       - name: Download MSIX packages
         if: steps.check_creds.outputs.HAS_CREDS == 'true'
         uses: actions/download-artifact@v4
@@ -573,15 +626,52 @@ jobs:
             --clientId $env:STORE_CLIENT_ID `
             --clientSecret $env:STORE_CLIENT_SECRET
 
-      - name: Submit to Microsoft Store
+      - name: Upload packages (without committing)
         if: steps.check_creds.outputs.HAS_CREDS == 'true'
         shell: pwsh
         run: |
           $packages = Get-ChildItem -Path packages -Include "*.msixupload","*.msix" -Recurse
-          Write-Host "Submitting $($packages.Count) package(s) to Microsoft Store..."
+          Write-Host "Uploading $($packages.Count) package(s) to Microsoft Store..."
           $packages | ForEach-Object {
             Write-Host "  - $($_.Name) ($([math]::Round($_.Length / 1MB, 2)) MB)"
           }
 
-          $packagePaths = $packages | Select-Object -ExpandProperty FullName
-          msstore publish --inputDirectory packages --id ${{ vars.STORE_APP_ID }}
+          if ($packages.Count -eq 0) {
+            Write-Error "No MSIX packages found in packages directory"
+            exit 1
+          }
+
+          # msstore publish requires a path/URL as first argument
+          $firstPackage = $packages[0].FullName
+          msstore publish $firstPackage --inputDirectory packages --appId ${{ vars.STORE_APP_ID }} --noCommit --verbose
+
+      - name: Update Store listing with release notes
+        if: steps.check_creds.outputs.HAS_CREDS == 'true'
+        shell: pwsh
+        env:
+          RELEASE_NOTES: ${{ steps.release_notes.outputs.NOTES }}
+        run: |
+          $appId = "${{ vars.STORE_APP_ID }}"
+          $notes = $env:RELEASE_NOTES
+
+          if ([string]::IsNullOrWhiteSpace($notes)) {
+            $notes = "Bug fixes and improvements."
+          }
+
+          # Escape special characters for JSON
+          $escapedNotes = $notes -replace '\\', '\\\\' -replace '"', '\"' -replace "`r", '' -replace "`n", '\n'
+
+          # Construct metadata JSON directly (PascalCase required for packaged apps)
+          $metadataJson = '{"Listings":{"en-us":{"BaseListing":{"ReleaseNotes":"' + $escapedNotes + '"}}}}'
+
+          Write-Host "Updating Store listing with release notes ($($notes.Length) chars)..."
+          msstore submission updateMetadata $appId $metadataJson --skipInitialPolling
+          Write-Host "Store listing metadata updated"
+
+      - name: Commit and publish submission
+        if: steps.check_creds.outputs.HAS_CREDS == 'true'
+        shell: pwsh
+        run: |
+          Write-Host "Committing Store submission..."
+          msstore submission publish ${{ vars.STORE_APP_ID }}
+          Write-Host "Store submission committed - awaiting certification"
diff --git a/CopyPaste.Core/UpdateChecker.cs b/CopyPaste.Core/UpdateChecker.cs
@@ -27,30 +27,43 @@ public sealed class UpdateChecker : IDisposable
     private static readonly Uri _gitHubReleasesUri = new(_gitHubReleasesUrl);
     private const string _dismissedVersionFileName = "dismissed_update.txt";
 
-    private static readonly TimeSpan _checkInterval = TimeSpan.FromHours(12);
+    private static readonly TimeSpan _startupDelay = TimeSpan.FromMinutes(1);
     private static readonly TimeSpan _httpTimeout = TimeSpan.FromSeconds(15);
 
     private readonly HttpClient _httpClient;
-    private readonly Timer _timer;
+    private readonly CancellationTokenSource _cts = new();
     private bool _isDisposed;
 
     /// <summary>
     /// Raised when a new version is available.
     /// </summary>
     public event EventHandler<UpdateAvailableEventArgs>? OnUpdateAvailable;
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types",
+        Justification = "Fire-and-forget task must never throw — unobserved exception would crash the process")]
     public UpdateChecker()
     {
         _httpClient = new HttpClient { Timeout = _httpTimeout };
         _httpClient.DefaultRequestHeaders.Add("User-Agent", "CopyPaste-UpdateChecker");
         _httpClient.DefaultRequestHeaders.Add("Accept", "application/vnd.github.v3+json");
 
-        _timer = new Timer(
-            _ => CheckForUpdateAsync().ConfigureAwait(false),
-            null,
-            TimeSpan.FromSeconds(30), // First check 30s after startup
-            _checkInterval
-        );
+        // Single check after startup delay — no recurring timer needed
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                await Task.Delay(_startupDelay, _cts.Token).ConfigureAwait(false);
+                await CheckForUpdateAsync().ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                // App closed before the check ran — expected
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Warn($"Update check unexpected error: {ex.Message}");
+            }
+        });
     }
 
     /// <summary>
@@ -75,10 +88,14 @@ public static string GetCurrentVersion()
         return version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : "0.0.0";
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types",
+        Justification = "Update check is non-critical — unexpected failures must be logged, not crash the app")]
     internal async Task CheckForUpdateAsync()
     {
         if (_isDisposed) return;
 
+        AppLogger.Info("Update check started...");
+
         try
         {
             using var response = await _httpClient.GetAsync(_gitHubReleasesUri).ConfigureAwait(false);
@@ -98,6 +115,12 @@ internal async Task CheckForUpdateAsync()
                 return;
             }
 
+            if (release.Prerelease)
+            {
+                AppLogger.Info("Update check: latest release is a pre-release, skipping");
+                return;
+            }
+
             var latestVersion = release.TagName.TrimStart('v', 'V');
             var currentVersion = GetCurrentVersion();
 
@@ -130,6 +153,14 @@ internal async Task CheckForUpdateAsync()
         {
             AppLogger.Warn($"Update check failed (parse): {ex.Message}");
         }
+        catch (ObjectDisposedException)
+        {
+            // Expected during shutdown — timer may fire while HttpClient is disposing
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn($"Update check failed: {ex.Message}");
+        }
     }
 
     /// <summary>
@@ -230,7 +261,8 @@ public void Dispose()
     {
         if (_isDisposed) return;
         _isDisposed = true;
-        _timer.Dispose();
+        _cts.Cancel();
+        _cts.Dispose();
         _httpClient.Dispose();
     }
 }
