Start & Destroy server only needed

Author: kadiryazici

src-tauri/src/commands.rs

@@ -1,7 +1,9 @@
-use std::{fs::File, io::BufReader};
+use std::{fs::File, io::BufReader, sync::Mutex};
 
 use rodio::{Decoder, OutputStream, Sink};
-use tauri::AppHandle;
+use tauri::{AppHandle, State, Window};
+
+use crate::server::AuthServer;
 
 #[tauri::command]
 pub fn play_notification_sound(app: AppHandle) {
@@ -32,3 +34,15 @@ pub fn set_icon_template(is_template: bool, app: AppHandle) {
         ))
         .unwrap();
 }
+
+#[tauri::command]
+pub fn start_server(window: Window, state: State<'_, Mutex<AuthServer>>) {
+    let mut server = state.lock().unwrap();
+    server.listen(window);
+}
+
+#[tauri::command]
+pub fn stop_server(window: Window, state: State<'_, Mutex<AuthServer>>) {
+    let mut server = state.lock().unwrap();
+    server.stop();
+}

src-tauri/src/main.rs

@@ -2,12 +2,15 @@
     all(not(debug_assertions), target_os = "windows"),
     windows_subsystem = "windows"
 )]
+#![allow(warnings, unused)]
 
 mod commands;
-mod http;
+mod server;
 
-use commands::{play_notification_sound, set_icon_template};
-use http::apply_http;
+use std::sync::Mutex;
+
+use commands::{play_notification_sound, set_icon_template, start_server, stop_server};
+use server::AuthServer;
 
 use tauri::{
     ActivationPolicy, App, AppHandle, GlobalWindowEvent, Manager, PhysicalPosition, SystemTray,
@@ -59,8 +62,6 @@ fn handle_setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
     )
     .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS");
 
-    apply_http(&win);
-
     Ok(())
 }
 
@@ -86,9 +87,12 @@ fn main() {
     let tray = SystemTray::new();
 
     tauri::Builder::default()
+        .manage(Mutex::new(AuthServer::new()))
         .invoke_handler(tauri::generate_handler![
             play_notification_sound,
-            set_icon_template
+            set_icon_template,
+            start_server,
+            stop_server
         ])
         .plugin(tauri_plugin_autostart::init(
             MacosLauncher::LaunchAgent,

src-tauri/src/http.rs src-tauri/src/server.rssrc-tauri/src/http.rs renamed to src-tauri/src/server.rs

@@ -1,7 +1,8 @@
-use std::{io::Cursor, str::FromStr};
+use tauri::{async_runtime::JoinHandle, Window};
+
+use std::{io::Cursor, str::FromStr, sync::Arc};
 
 use ::ascii::AsciiString;
-use tauri::Window;
 use tiny_http::{Header, HeaderField, Method, Request, Response, Server};
 
 const STYLE: &str = r#"
@@ -100,14 +101,36 @@ fn handle_code_request(request: Request, window: &Window) {
     request.respond(response).unwrap();
 }
 
-pub fn apply_http(window: &Window) {
-    let win = window.clone();
+pub struct AuthServer {
+    server: Option<Arc<Server>>,
+}
 
-    tauri::async_runtime::spawn(async move {
-        let server = Server::http("0.0.0.0:23846").unwrap();
+impl AuthServer {
+    pub fn new() -> AuthServer {
+        AuthServer { server: None }
+    }
 
-        for request in server.incoming_requests() {
-            handle_code_request(request, &win);
+    pub fn listen(&mut self, window: Window) {
+        if self.server.is_some() {
+            return;
         }
-    });
+
+        let server = Arc::new(Server::http("0.0.0.0:23846").unwrap());
+        std::thread::spawn({
+            let server = Arc::clone(&server);
+            move || {
+                for request in server.incoming_requests() {
+                    handle_code_request(request, &window);
+                }
+            }
+        });
+
+        self.server = Some(server)
+    }
+
+    pub fn stop(&mut self) {
+        if let Some(server) = self.server.take() {
+            server.unblock();
+        }
+    }
 }

src/constants.ts

@@ -13,6 +13,8 @@ export enum Page {
 export enum InvokeCommand {
   PlayNotificationSound = 'play_notification_sound',
   SetIconTemplate = 'set_icon_template',
+  StartServer = 'start_server',
+  StopServer = 'stop_server',
 }
 
 export enum NotificationSubject {

src/main.ts

@@ -9,9 +9,9 @@ import relativeTime from 'dayjs/plugin/relativeTime'
 import App from './App.vue'
 import { AppStorage, cacheStorageFromDisk } from './storage'
 import { useStore } from './stores/store'
-import { Page } from './constants'
 import { initDevtools } from './utils/initDevtools'
 import { useKey } from './composables/useKey'
+import { Page } from './constants'
 
 (async () => {
   dayjs.extend(relativeTime)

src/pages/LandingPage.vue

@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { open } from '@tauri-apps/api/shell'
 import { ref } from 'vue'
+import { invoke } from '@tauri-apps/api/tauri'
 import AppButton from '../components/AppButton.vue'
-import { Page } from '../constants'
+import { InvokeCommand, Page } from '../constants'
 import { useStore } from '../stores/store'
 import { useTauriEvent } from '../composables/useTauriEvent'
 import { getAccessToken } from '../api/token'
@@ -15,6 +16,8 @@ const store = useStore()
 
 const processing = ref(false)
 
+invoke(InvokeCommand.StartServer)
+
 useTauriEvent<string>('code', async ({ payload }) => {
   if (processing.value)
     return
@@ -32,6 +35,7 @@ useTauriEvent<string>('code', async ({ payload }) => {
 
     AppStorage.set('accessToken', access_token)
     AppStorage.set('user', user)
+    invoke(InvokeCommand.StopServer)
     store.setPage(Page.Home)
     store.fetchNotifications(true)
   }