From 49749c4dcf65dc8437c266693d907b3340eb223b Mon Sep 17 00:00:00 2001
From: roiii <lyt2980999208@gmail.com>
Date: Tue, 3 Dec 2024 15:54:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20=E5=8E=9F=E7=94=9F=20MacOs=20?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=20(#215)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Roy <liuyitang@yunzhangfang.com>
Co-authored-by: Akirami <66513481+A-kirami@users.noreply.github.com>
---
 src-tauri/src/lib.rs          | 21 +++++++++++++++++++--
 src-tauri/tauri.conf.json     | 10 ----------
 src/components/AppSidebar.vue |  5 ++---
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 56017265..2fdbe33a 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,4 +1,4 @@
-use tauri::Manager;
+use tauri::{Manager, WebviewUrl, WebviewWindowBuilder};
 
 mod command;
 mod server;
@@ -8,8 +8,25 @@ mod utils;
 pub fn run() {
     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();
+
             #[cfg(dev)]
-            app.get_webview_window("main",).unwrap().open_devtools();
+            window.open_devtools();
 
             let cache_path = app.handle().path().app_cache_dir().unwrap();
             let port: u16 = 8720;
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 75837706..2266aa8b 100644
--- a/src-tauri/tauri.conf.json
+++ b/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
diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue
index 9247b55c..d6b54950 100644
--- a/src/components/AppSidebar.vue
+++ b/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" />

From 5875145a07da311b27cdfc0b7f3425237e90172f Mon Sep 17 00:00:00 2001
From: Akirami <66513481+A-kirami@users.noreply.github.com>
Date: Wed, 4 Dec 2024 00:08:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=A8=20=E6=94=AF=E6=8C=81=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=B5=84=E6=BA=90=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=20(#213)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/Cargo.lock           | 12 ++++++++
 src-tauri/Cargo.toml           |  1 +
 src-tauri/src/command.rs       | 42 ++++++++++++++++++++++++++
 src-tauri/src/lib.rs           | 54 ++++++++++++++++++----------------
 src-tauri/src/server.rs        | 38 ------------------------
 src-tauri/src/state.rs         | 16 ++++++++++
 src-tauri/src/utils.rs         |  9 +-----
 src/layouts/default.vue        |  2 ++
 src/stores/general-settings.ts | 20 +++++++++++++
 src/utils/file.ts              |  4 ++-
 src/views/settings/general.vue | 11 +++++++
 11 files changed, 136 insertions(+), 73 deletions(-)
 delete mode 100644 src-tauri/src/server.rs
 create mode 100644 src-tauri/src/state.rs

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 463af0bf..a5a11830 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2340,6 +2340,7 @@ dependencies = [
  "tauri-plugin-updater",
  "tauri-plugin-websocket",
  "tokio",
+ "tokio-stream",
  "url",
  "warp",
 ]
@@ -4941,6 +4942,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-tungstenite"
 version = "0.21.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d5e52ec6..4ddcbf36 100644
--- a/src-tauri/Cargo.toml
+++ b/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"
diff --git a/src-tauri/src/command.rs b/src-tauri/src/command.rs
index be80b5b7..af05e09d 100644
--- a/src-tauri/src/command.rs
+++ b/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(),),
+    }
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 2fdbe33a..c3ef2966 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,43 +1,44 @@
 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| {
-            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();
+    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(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,);
+        #[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();
+        let window = win_builder.build().unwrap();
 
-            #[cfg(dev)]
+        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(),)
@@ -66,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",);
diff --git a/src-tauri/src/server.rs b/src-tauri/src/server.rs
deleted file mode 100644
index b747dd19..00000000
--- a/src-tauri/src/server.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use std::{net::TcpListener, path::PathBuf};
-
-use warp::Filter;
-
-use crate::utils::get_unused_port;
-
-pub fn start_static_file_server(cache_path: PathBuf, port: u16,) {
-    let port = match TcpListener::bind(("127.0.0.1", port,),) {
-        Ok(_,) => port,
-        Err(_,) => get_unused_port(),
-    };
-
-    let static_route = warp::path("matcha",)
-        .and(warp::path("cache",),)
-        .and(warp::path::param::<String,>(),)
-        .and_then(move |file: String| {
-            let file_path = cache_path.join("cache",).join(file,);
-            async move {
-                if file_path.exists() {
-                    let content = std::fs::read(file_path,).unwrap();
-                    Ok(warp::http::Response::builder()
-                        .header("Content-Type", "application/octet-stream",)
-                        .body(content,)
-                        .unwrap(),)
-                } else {
-                    Err(warp::reject::not_found(),)
-                }
-            }
-        },);
-
-    let cors = warp::cors().allow_any_origin().allow_methods(vec!["GET"],);
-
-    let routes = static_route.with(cors,);
-
-    tauri::async_runtime::spawn(async move {
-        warp::serve(routes,).run(([127, 0, 0, 1,], port,),).await;
-    },);
-}
diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs
new file mode 100644
index 00000000..21d4c62e
--- /dev/null
+++ b/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();
+        }
+    }
+}
diff --git a/src-tauri/src/utils.rs b/src-tauri/src/utils.rs
index 0e7efe38..4944fbe2 100644
--- a/src-tauri/src/utils.rs
+++ b/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
-}
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 45504eea..bd230c7d 100644
--- a/src/layouts/default.vue
+++ b/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()
diff --git a/src/stores/general-settings.ts b/src/stores/general-settings.ts
index 8b27364d..018cb850 100644
--- a/src/stores/general-settings.ts
+++ b/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,
     })
   },
 
diff --git a/src/utils/file.ts b/src/utils/file.ts
index 57821bd1..8f4d36dc 100644
--- a/src/utils/file.ts
+++ b/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: {
diff --git a/src/views/settings/general.vue b/src/views/settings/general.vue
index e12180bf..08672b23 100644
--- a/src/views/settings/general.vue
+++ b/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>