Merge branch 'main' into fix/ws-connect

src-tauri/Cargo.toml

@@ -30,6 +30,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 anyhow = "1.0"
 tokio = "1.4"
+tokio-stream = { version = "0.1", features = ["net"] }
 log = "0.4"
 infer = "0.16"
 warp = "0.3"

src-tauri/src/command.rs

@@ -288,3 +288,45 @@ pub async fn copy_file(source: PathBuf, target: PathBuf,) -> Result<(), String,>
         .map_err(|err| format!("复制文件失败: {}", err),)?;
     Ok((),)
 }
+
+use tauri::State;
+use tokio::{net::TcpListener, sync::Mutex};
+use tokio_stream::wrappers::TcpListenerStream;
+use warp::Filter;
+
+use crate::state::AppState;
+
+#[tauri::command]
+pub async fn start_assets_server(
+    app_handle: AppHandle,
+    state: State<'_, Mutex<AppState,>,>,
+    host: String,
+    port: u16,
+) -> Result<(), String,> {
+    let cache_dir = get_cache_file_path(app_handle,);
+
+    let cors = warp::cors().allow_any_origin().allow_methods(vec!["GET"],);
+
+    let route = warp::path("matcha",)
+        .and(warp::path("cache",),)
+        .and(warp::fs::dir(cache_dir,),)
+        .with(cors,);
+
+    let mut state = state.lock().await;
+
+    state.stop_server();
+
+    let addr = format!("{}:{}", host, port);
+    match TcpListener::bind(&addr,).await {
+        Ok(listener,) => {
+            let new_handle = tauri::async_runtime::spawn(async move {
+                let stream = TcpListenerStream::new(listener,);
+                warp::serve(route,).run_incoming(stream,).await;
+            },);
+
+            state.set_handle(new_handle,);
+            Ok((),)
+        }
+        Err(e,) => Err(e.to_string(),),
+    }
+}

src-tauri/src/lib.rs

@@ -1,26 +1,44 @@
-use tauri::Manager;
-
+use tauri::{Manager, WebviewUrl, WebviewWindowBuilder};
 mod command;
-mod server;
+mod state;
 mod utils;
+use tokio::sync::Mutex;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    tauri::Builder::default()
-        .setup(|app| {
-            #[cfg(dev)]
-            app.get_webview_window("main",).unwrap().open_devtools();
+    let mut builder = tauri::Builder::default().setup(|app| {
+        let win_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default(),)
+            .title("Matcha",)
+            .min_inner_size(620.0, 540.0,)
+            .inner_size(1080.0, 720.0,)
+            .center();
+
+        #[cfg(not(target_os = "macos"))]
+        let win_builder = win_builder.decorations(false,).transparent(true,);
+
+        #[cfg(target_os = "macos")]
+        let win_builder = win_builder
+            .decorations(true,)
+            .hidden_title(true,)
+            .title_bar_style(tauri::TitleBarStyle::Overlay,);
+
+        let window = win_builder.build().unwrap();
+
+        if tauri::is_dev() {
+            window.open_devtools();
+        }
+
+        app.manage(Mutex::new(state::AppState::default(),),);
 
-            let cache_path = app.handle().path().app_cache_dir().unwrap();
-            let port: u16 = 8720;
-            server::start_static_file_server(cache_path, port,);
+        Ok((),)
+    },);
 
-            #[cfg(desktop)]
-            app.handle()
-                .plugin(tauri_plugin_updater::Builder::new().build(),)?;
+    #[cfg(desktop)]
+    {
+        builder = builder.plugin(tauri_plugin_updater::Builder::new().build(),)
+    }
 
-            Ok((),)
-        },)
+    builder
         .plugin(tauri_plugin_os::init(),)
         .plugin(tauri_plugin_fs::init(),)
         .plugin(tauri_plugin_websocket::init(),)
@@ -49,6 +67,7 @@ pub fn run() {
             command::merge_file_fragment,
             command::write_file,
             command::copy_file,
+            command::start_assets_server,
         ],)
         .run(tauri::generate_context!(),)
         .expect("error while running tauri application",);

src-tauri/src/state.rs

@@ -0,0 +1,16 @@
+#[derive(Default,)]
+pub struct AppState {
+    server_handle: Option<tauri::async_runtime::JoinHandle<(),>,>,
+}
+
+impl AppState {
+    pub(crate) fn set_handle(&mut self, handle: tauri::async_runtime::JoinHandle<(),>,) {
+        self.server_handle = Some(handle,);
+    }
+
+    pub(crate) fn stop_server(&mut self,) {
+        if let Some(handle,) = self.server_handle.take() {
+            handle.abort();
+        }
+    }
+}

src-tauri/src/utils.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, error::Error, fs, net::TcpListener, path::PathBuf, str};
+use std::{collections::HashMap, error::Error, fs, path::PathBuf, str};
 
 use base64::{engine::general_purpose, Engine as _};
 use regex::Regex;
@@ -117,10 +117,3 @@ pub fn validate_file(
     }
     Ok((),)
 }
-
-pub fn get_unused_port() -> u16 {
-    let listener = TcpListener::bind("127.0.0.1:0",).unwrap();
-    let port = listener.local_addr().unwrap().port();
-    drop(listener,);
-    port
-}

src-tauri/tauri.conf.json

@@ -12,16 +12,6 @@
   "app": {
     "macOSPrivateApi": true,
     "windows": [
-      {
-        "title": "Matcha",
-        "height": 720,
-        "width": 1080,
-        "minHeight": 540,
-        "minWidth": 620,
-        "center": true,
-        "decorations": false,
-        "transparent": true
-      }
     ],
     "security": {
       "csp": null

src/components/AppSidebar.vue

@@ -8,13 +8,12 @@ const isMacOs = $computed(() => unref(osType) === 'macos')
 
 <template>
   <aside
-    class="w-15 flex flex-col items-center gap-4 bg-background pb-5"
+    class="flex flex-col items-center gap-4 bg-background pb-5"
     :class="[
       focused ? 'bg-opacity-40 dark:bg-opacity-60' : 'bg-opacity-70 dark:bg-opacity-90',
-      isMacOs ? 'pt-2' : 'pt-7',
+      isMacOs ? 'pt-8 w-18' : 'pt-7 w-15',
     ]"
   >
-    <WindowControls v-if="isMacOs" />
     <AppLogo class="size-9" />
     <AppSidebarNavigation />
     <AppSidebarUserAvatar class="mt-auto" />

src/layouts/default.vue

@@ -21,6 +21,8 @@ onMounted(async () => {
 
   const general = useGeneralSettingsStore()
 
+  await general.startAssetsServer(general.assetsServerAddress)
+
   if (isRelease && general.autoUpdate) {
     try {
       const update = await check()

src/stores/general-settings.ts

@@ -1,4 +1,6 @@
+import { invoke } from '@tauri-apps/api/core'
 import { defineStore } from 'pinia'
+import { toast } from 'vue-sonner'
 
 export interface GeneralSettings {
   theme: 'light' | 'dark' | 'auto'
@@ -8,6 +10,7 @@ export interface GeneralSettings {
   showRecallMessage: boolean
   applyAcrylicWindowEffects: boolean
   enableLinkPreview: boolean
+  assetsServerAddress: string
 }
 
 export const useGeneralSettingsStore = defineStore(
@@ -21,11 +24,26 @@ export const useGeneralSettingsStore = defineStore(
     const showRecallMessage = $ref<GeneralSettings['showRecallMessage']>(true)
     const applyAcrylicWindowEffects = $ref<GeneralSettings['applyAcrylicWindowEffects']>(false)
     const enableLinkPreview = $ref<GeneralSettings['enableLinkPreview']>(true)
+    const assetsServerAddress = $ref<GeneralSettings['assetsServerAddress']>('127.0.0.1:8720')
+
+    async function startAssetsServer(address: string): Promise<void> {
+      const [host, port] = address.split(':')
+      try {
+        await invoke('start_assets_server', { host, port: Number.parseInt(port) })
+        toast.success('资源服务器已启动', { description: `地址: ${address}` })
+      } catch (error) {
+        toast.error('资源服务器错误', { description: error as string })
+      }
+    }
 
     watch($$(applyAcrylicWindowEffects), async (enable) => {
       await setAcrylicWindowEffect(enable)
     })
 
+    watch($$(assetsServerAddress), async (address) => {
+      await startAssetsServer(address)
+    })
+
     return $$({
       theme,
       autoUpdate,
@@ -34,6 +52,8 @@ export const useGeneralSettingsStore = defineStore(
       showRecallMessage,
       applyAcrylicWindowEffects,
       enableLinkPreview,
+      assetsServerAddress,
+      startAssetsServer,
     })
   },
 

src/utils/file.ts

@@ -2,6 +2,8 @@ import { invoke } from '@tauri-apps/api/core'
 import { appCacheDir, join } from '@tauri-apps/api/path'
 import { exists, BaseDirectory } from '@tauri-apps/plugin-fs'
 
+const general = useGeneralSettingsStore()
+
 interface FileSource {
   str?: string
   binary?: number[]
@@ -82,7 +84,7 @@ export async function getFile(type: GetType, fileId: string): Promise<string | U
   }
   switch (type) {
     case GetType.URL: {
-      return `http://127.0.0.1:8720/matcha/cache/${file.sha256}`
+      return `http://${general.assetsServerAddress}/matcha/cache/${file.sha256}`
     }
     case GetType.PATH:
     case GetType.DATA: {

src/views/settings/general.vue

@@ -28,6 +28,7 @@ const generalSettingsSchema = toTypedSchema(
     showRecallMessage: z.boolean(),
     applyAcrylicWindowEffects: z.boolean(),
     enableLinkPreview: z.boolean(),
+    assetsServerAddress: z.string().regex(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]{1,5}$/, '服务器地址格式不正确'),
   }),
 )
 
@@ -165,5 +166,15 @@ const osType = getOsType()
         </FormControl>
       </FormItem>
     </FormField>
+    <FormField v-slot="{ componentField }" name="assetsServerAddress">
+      <FormItem v-auto-animate>
+        <FormLabel>资源服务器地址</FormLabel>
+        <FormControl>
+          <Input type="text" v-bind="componentField" class="h-9 max-w-100" />
+        </FormControl>
+        <FormDescription>指定用于提供资源文件的服务器地址</FormDescription>
+        <FormMessage />
+      </FormItem>
+    </FormField>
   </form>
 </template>