Fix: CI. Add Close to Tray dialog and improve shutdown handling

Introduced CloseToTrayDialog for window close actions, allowing users to choose hide-to-tray or exit and remember their preference. Moved core manager shutdown logic to App for proper cleanup. Improved DownloadManager and RSSManager thread responsiveness. Updated MainViewModel port check to prevent shutdown hangs. Enhanced build pipeline for multi-platform packaging and artifact handling. Includes minor fixes and project file updates.

Author: hoshiizumiya

.github/workflows/alpha.yml

@@ -12,6 +12,15 @@ jobs:
   alpha:
     runs-on: windows-2025-vs2026
 
+    strategy:
+      matrix:
+        configuration: [Release]
+        platform: [x64, ARM64]
+
+    permissions:
+      contents: write
+      packages: write
+
     steps:
       - uses: actions/checkout@v5
         with:
@@ -20,34 +29,72 @@ jobs:
       - uses: microsoft/setup-msbuild@v2
       - uses: nuget/setup-nuget@v2
 
-      - name: Restore Cert
+      - name: Set up vcpkg
+        working-directory: ${{env.VCPKG_INSTALLATION_ROOT}}
+        run: vcpkg integrate install
+
+      - name: Restore NuGet
+        run: nuget restore OpenNet.slnx
+        shell: pwsh
+
+      - name: cache nuget packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.nuget/packages
+
+      - name: Restore Certificate
         run: |
           $bytes = [Convert]::FromBase64String("${{ secrets.PFX_CERT_BASE64 }}")
           [IO.File]::WriteAllBytes("cert.pfx", $bytes)
         shell: pwsh
-
-      - run: nuget restore OpenNet.slnx
-        shell: pwsh
-
-      - name: Build Bundle
+        
+      - name: Build MSIX
         run: |
           msbuild OpenNet.slnx `
-            /p:Configuration=Release `
-            /p:Platform=x64 `
-            /p:AppxBundle=Always `
-            /p:AppxBundlePlatforms="x64|ARM64" `
-            /p:GenerateAppxPackageOnBuild=true `
-            /p:PackageCertificateKeyFile=cert.pfx `
-            /p:PackageCertificatePassword="${{ secrets.PFX_PASSWORD }}" `
+            /p:Configuration=${{ matrix.configuration }} `
+            /p:Platform=${{ matrix.platform }} `
+            /p:UapAppxPackageBuildMode=SideloadOnly `
             /p:AppxPackageSigningEnabled=true `
-            /p:VcpkgEnableManifest=true `
+            /p:PackageCertificateKeyFile=../cert.pfx `
+            /p:PackageCertificatePassword="${{ secrets.PFX_PASSWORD }}" `
             /m
         shell: pwsh
+        
+      - name: Generate Date
+        run: |
+          $date = Get-Date -Format yyyyMMdd
+          Add-Content -Path $Env:GITHUB_ENV -Value "DATE=$date"
+        shell: pwsh
+        
+      - name: Zip Package
+        run: |
+          Compress-Archive `
+            -Path "Packages/*${{ matrix.platform }}*" `
+            -DestinationPath "OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.zip"
+        shell: pwsh
+
+      - name: 7z Package
+        run: |
+          if (-not (Get-Command 7z -ErrorAction SilentlyContinue)) {
+            choco install 7zip -y
+          }
 
-      - uses: softprops/action-gh-release@v2
+          7z a -t7z -mx=9 `
+            "OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.7z" `
+            "Packages\*${{ matrix.platform }}*"
+        shell: pwsh
+        
+      - name: Upload Canary Artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}
+          path: |
+            OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.zip
+            OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.7z
+            
+      - name: Create Pre-release
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
           prerelease: true
-          files: "**/*.msixbundle"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          files: OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.zip, OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.7z

.github/workflows/canary.yml

@@ -41,10 +41,19 @@ jobs:
       - uses: microsoft/setup-msbuild@v2
       - uses: nuget/setup-nuget@v2
 
+      - name: Set up vcpkg
+        working-directory: ${{env.VCPKG_INSTALLATION_ROOT}}
+        run: vcpkg integrate install
+
       - name: Restore NuGet
         run: nuget restore OpenNet.slnx
         shell: pwsh
-        
+
+      - name: cache nuget packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.nuget/packages
+
       - name: Restore Certificate
         run: |
           $bytes = [Convert]::FromBase64String("${{ secrets.PFX_CERT_BASE64 }}")

OpenNet/App.xaml.cpp

@@ -2,13 +2,17 @@
 #include "App.xaml.h"
 #include "MainWindow.xaml.h"
 #include "UI/Shell/NotifyIconContextMenu.xaml.h"
+#include "UI/Xaml/View/Dialog/CloseToTrayDialog.h"
 #include "Helpers/WindowHelper.h"
 #include "Helpers/ThemeHelper.h"
 #include "Core/P2PManager.h"
+#include "Core/DownloadManager.h"
 #include "Core/RSS/RSSManager.h"
 #include "Core/GeoIP/GeoIPManager.h"
 
 #include <winrt/Windows.ApplicationModel.Activation.h>
+#include <winrt/Microsoft.Windows.Storage.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
 #include <sentry.h>
 
 using namespace winrt;
@@ -60,23 +64,26 @@ namespace winrt::OpenNet::implementation
         trayIcon = OpenNet::UI::Shell::NotifyIconContextMenu();
         trayIcon.Show();
 
-        // Register window closing event - hide to tray instead of closing
+        // Register window closing event - close strategy (hide to tray / ask / exit)
         window.AppWindow().Closing([](auto const&, winrt::Microsoft::UI::Windowing::AppWindowClosingEventArgs const& args)
         {
             // If we are in an intentional exit, allow the window to close
             if (App::s_isExiting)
                 return;
 
-            // Cancel the close and hide to tray instead
+            // If no tray icon was created, allow direct close
+            if (!App::trayIcon)
+                return;
+
+            // Cancel the close; the async strategy decides what happens next
             args.Cancel(true);
 
-            // Hide the window
-            if (App::window)
-            {
-                App::window.AppWindow().Hide();
-            }
+            // Prevent re-entrance
+            if (App::s_isHandlingClose)
+                return;
+            App::s_isHandlingClose = true;
 
-            OutputDebugStringA("App: MainWindow hidden to tray\n");
+            HandleCloseStrategyAsync();
         });
 
         // Initialize RSS Manager early so feeds update in the background
@@ -203,11 +210,14 @@ namespace winrt::OpenNet::implementation
                 trayIcon = nullptr;
             }
 
+            // Stop RSS background updates
+            ::OpenNet::Core::RSS::RSSManager::Instance().Stop();
+
             // Shutdown P2PManager
             ::OpenNet::Core::P2PManager::Instance().Shutdown();
 
-            // Stop RSS background updates
-            ::OpenNet::Core::RSS::RSSManager::Instance().Stop();
+            // Shutdown DownloadManager (Aria2 + refresh thread)
+            ::OpenNet::Core::DownloadManager::Instance().Shutdown();
 
             // make sure everything flushes
             sentry_close();
@@ -223,6 +233,102 @@ namespace winrt::OpenNet::implementation
         }
     }
 
+    winrt::fire_and_forget App::HandleCloseStrategyAsync()
+    {
+        try
+        {
+            auto localSettings = winrt::Microsoft::Windows::Storage::ApplicationData::GetDefault().LocalSettings();
+            auto values = localSettings.Values();
+
+            // Strategy A: user already chose, don't ask again
+            if (values.HasKey(L"Hide2TrayWhenCloseAsked"))
+            {
+                bool asked = unbox_value<bool>(values.Lookup(L"Hide2TrayWhenCloseAsked"));
+                if (asked)
+                {
+                    bool hide = false;
+                    if (values.HasKey(L"Hide2TrayWhenClose"))
+                        hide = unbox_value<bool>(values.Lookup(L"Hide2TrayWhenClose"));
+
+                    if (hide)
+                        HideToTray();
+                    else
+                        ReallyClose();
+
+                    s_isHandlingClose = false;
+                    co_return;
+                }
+            }
+
+            // Strategy B: first time — show dialog
+            if (!window)
+            {
+                ReallyClose();
+                s_isHandlingClose = false;
+                co_return;
+            }
+
+            auto content = window.Content();
+            if (!content)
+            {
+                ReallyClose();
+                s_isHandlingClose = false;
+                co_return;
+            }
+
+            auto xamlRoot = content.XamlRoot();
+            if (!xamlRoot)
+            {
+                ReallyClose();
+                s_isHandlingClose = false;
+                co_return;
+            }
+
+            auto dlg = winrt::OpenNet::UI::Xaml::View::Dialog::CloseToTrayDialog();
+            dlg.XamlRoot(xamlRoot);
+
+            auto result = co_await dlg.ShowAsync();
+
+            // Save preference if "remember" was checked
+            if (dlg.RememberChoice())
+            {
+                values.Insert(L"Hide2TrayWhenCloseAsked", box_value(true));
+                values.Insert(L"Hide2TrayWhenClose", box_value(result == winrt::Microsoft::UI::Xaml::Controls::ContentDialogResult::Primary));
+            }
+
+            if (result == winrt::Microsoft::UI::Xaml::Controls::ContentDialogResult::Primary)
+            {
+                HideToTray();
+            }
+            else
+            {
+                ReallyClose();
+            }
+        }
+        catch (...)
+        {
+            OutputDebugStringA("App: HandleCloseStrategyAsync error, falling back to exit\n");
+            ReallyClose();
+        }
+
+        s_isHandlingClose = false;
+    }
+
+    void App::HideToTray()
+    {
+        if (window)
+        {
+            window.AppWindow().Hide();
+        }
+        OutputDebugStringA("App: MainWindow hidden to tray\n");
+    }
+
+    void App::ReallyClose()
+    {
+        s_isExiting = true;
+        Microsoft::UI::Xaml::Application::Current().Exit();
+    }
+
     winrt::fire_and_forget App::InitializeRSSManagerAsync()
     {
         try

OpenNet/App.xaml.h

@@ -23,8 +23,11 @@ namespace winrt::OpenNet::implementation
 		static inline bool s_isExiting{ false };
 
 	private:
-		void OnClosing(winrt::Microsoft::UI::Xaml::Window const& sender,
-					   winrt::Microsoft::UI::Xaml::WindowEventArgs const& args);
+		static winrt::fire_and_forget HandleCloseStrategyAsync();
+		static void HideToTray();
+		static void ReallyClose();
 		static winrt::fire_and_forget InitializeRSSManagerAsync();
+
+		static inline bool s_isHandlingClose{ false };
 	};
 }

OpenNet/Core/DownloadManager.cpp

@@ -77,7 +77,11 @@ namespace OpenNet::Core
         }
 
         // Stop refresh thread
-        m_stopRefresh.store(true);
+        {
+            std::lock_guard stopLock(m_stopMutex);
+            m_stopRefresh.store(true);
+        }
+        m_stopCv.notify_all();
         if (m_refreshThread.joinable())
             m_refreshThread.join();
 
@@ -311,11 +315,10 @@ namespace OpenNet::Core
                 ProcessAria2Tasks();
             }
 
-            // Sleep remainder of interval
-            auto elapsed = clock::now() - start;
-            if (elapsed < kInterval)
+            // Sleep remainder of interval, wake immediately if stopped
             {
-                std::this_thread::sleep_for(kInterval - elapsed);
+                std::unique_lock<std::mutex> lock(m_stopMutex);
+                m_stopCv.wait_for(lock, kInterval, [this] { return m_stopRefresh.load(); });
             }
         }
     }

OpenNet/Core/DownloadManager.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <cstdint>
+#include <condition_variable>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -110,6 +111,8 @@ namespace OpenNet::Core
 
         std::thread m_refreshThread;
         std::atomic<bool> m_stopRefresh{false};
+        std::condition_variable m_stopCv;
+        std::mutex m_stopMutex;
         mutable std::mutex m_mutex;
 
         // Cached task GIDs for change detection

OpenNet/Core/IO/FileSystem.cpp

@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "FileSystem.h"
-#include "..\AppEnvironment.h"
+#include "../AppEnvironment.h"
 #include <winrt/Microsoft.Windows.Storage.h>
 #include <shlobj_core.h>
 #include <windows.h>

OpenNet/Core/IO/FileSystem.h

@@ -10,6 +10,7 @@ namespace winrt::OpenNet::Core::IO
         // Get AppData folder path (where SQLite database is stored)
         // Returns path to %APPDATA%\OpenNet
         static std::string GetAppDataPath();
+        static std::string AppDataPath;
 
         // Get application temporary folder
         static std::string GetTempPath();

OpenNet/Core/RSS/RSSManager.cpp

@@ -131,6 +131,7 @@ namespace OpenNet::Core::RSS
             // Fetch outside the lock to avoid deadlock
             for (const auto& id : feedsToUpdate)
             {
+                if (!m_running.load()) break;
                 FetchFeed(id);
             }