Release native helper v0.3.12

Author: MasterSelects

.github/workflows/native-helper-release.yml

@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version tag (e.g. v0.3.11)'
+        description: 'Version tag (e.g. v0.3.12)'
         required: true
-        default: 'v0.3.11'
+        default: 'v0.3.12'
 
 jobs:
   build:

src/services/nativeHelper/releases.ts

@@ -1,4 +1,4 @@
-export const NATIVE_HELPER_TARGET_VERSION = '0.3.11';
+export const NATIVE_HELPER_TARGET_VERSION = '0.3.12';
 export const NATIVE_HELPER_RELEASES_URL = 'https://github.com/Sportinger/MasterSelects/releases';
 
 const GITHUB_RELEASES_API_URL = 'https://api.github.com/repos/Sportinger/MasterSelects/releases?per_page=20';

src/version.ts

@@ -40,7 +40,7 @@ export const FEATURED_VIDEO: {
 // Build/Platform notice shown at top of changelog (set to null to hide)
 export const BUILD_NOTICE: ChangelogNotice | null = {
   type: 'success',
-  title: 'Native Helper v0.3.11 available',
+  title: 'Native Helper v0.3.12 available',
   message: 'Adds masterselects.com helper detection while keeping the hardened localhost bridge checks and helper update flow in place.',
   animated: true,
 };

tools/native-helper/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "masterselects-helper"
-version = "0.3.11"
+version = "0.3.12"
 edition = "2021"
 authors = ["MasterSelects Team"]
 description = "Local control, storage, and download helper for MasterSelects"

tools/native-helper/Cargo.toml

@@ -261,11 +261,21 @@ fn run_with_tray(config: server::ServerConfig, _args: &Args) {
     let port = config.port;
     let state = Arc::new(tray::TrayState::new());
     let state_for_server = state.clone();
+    let state_for_error = state.clone();
 
     // Spawn server on a worker thread (with its own tokio runtime)
     let server_thread = std::thread::spawn(move || {
         let rt = tokio::runtime::Runtime::new().expect("Failed to create Tokio runtime");
         if let Err(e) = rt.block_on(server::run_with_shutdown(config, state_for_server)) {
+            if let Ok(mut slot) = state_for_error.server_error.lock() {
+                *slot = Some(e.to_string());
+            }
+            state_for_error
+                .running
+                .store(false, std::sync::atomic::Ordering::Relaxed);
+            state_for_error
+                .quit_requested
+                .store(true, std::sync::atomic::Ordering::Relaxed);
             eprintln!("Server error: {}", e);
         }
     });

tools/native-helper/src/main.rs

@@ -41,6 +41,7 @@ pub struct TrayState {
     pub running: AtomicBool,
     pub quit_requested: AtomicBool,
     pub connection_count: AtomicU32,
+    pub server_error: Mutex<Option<String>>,
     pub update_status: Mutex<UpdateStatus>,
 }
 
@@ -50,6 +51,7 @@ impl TrayState {
             running: AtomicBool::new(false),
             quit_requested: AtomicBool::new(false),
             connection_count: AtomicU32::new(0),
+            server_error: Mutex::new(None),
             update_status: Mutex::new(UpdateStatus::Idle),
         }
     }
@@ -134,6 +136,10 @@ pub fn run_tray(state: Arc<TrayState>, port: u16) -> Result<()> {
     let mut last_update_menu_text = String::new();
 
     loop {
+        if state.quit_requested.load(Ordering::Relaxed) {
+            return Ok(());
+        }
+
         // Pump Win32 messages (keeps tray icon responsive)
         unsafe {
             let mut msg: MSG = std::mem::zeroed();