fix: 修复字体 api 请求失败的问题

QingXia-Ela · Jul 29, 2024 · b9bd878 · b9bd878
1 parent 5f93cbc
commit b9bd878
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 22 deletions.
diff --git a/packages/plugins/ncm_inject/src-rust/Cargo.lock b/packages/plugins/ncm_inject/src-rust/Cargo.lock
diff --git a/packages/plugins/ncm_inject/src-rust/src/injector/request_handler.rs b/packages/plugins/ncm_inject/src-rust/src/injector/request_handler.rs
@@ -60,16 +60,7 @@ impl NcmRequestHandler {
     }
 
     #[tokio::main]
-    pub async fn ping(&self) {
-        let res = self
-            .client
-            .get(format!("{REQUEST_BASE}/pong"))
-            .send()
-            .await
-            .unwrap();
-
-        // if res.status()
-    }
+    pub async fn ping(&self) {}
 
     /// Only allow get single song.
     #[tokio::main]

diff --git a/src-tauri/src/proxy/cdn_proxy.rs b/src-tauri/src/proxy/cdn_proxy.rs
@@ -182,6 +182,8 @@ async fn handle_request(
 
 fn change_body(body: String, port: u16, api_port: u16, filter_rules: FilterType) -> String {
     let mut basic = body
+        // fontset api handle
+        .replace("/api/fontset", "/fontset")
         // replace cdn
         .replace("web.hycdn.cn", format!("localhost:{}", port).as_str())
         .replace("https", "http")

diff --git a/src-tauri/src/proxy/handler/mod.rs b/src-tauri/src/proxy/handler/mod.rs
@@ -128,9 +128,18 @@ pub async fn handle_request_with_plugin(
                         msg: "".to_string(),
                         data: r,
                     };
-                    return Ok(get_response_from_string(
-                        serde_json::to_string(&res).unwrap(),
-                    ));
+                    match serde_json::to_string(&res) {
+                        Ok(s) => {
+                            return Ok(get_response_from_string(s));
+                        }
+                        Err(e) => {
+                            #[cfg(debug_assertions)]
+                            logger::error(format!("{:?}", e).as_str());
+                            return Ok(parse_plugin_request_error_2_warp_rejection(
+                                PluginRequestError::new(format!("{:?}", e)),
+                            ));
+                        }
+                    }
                 }
                 Err(e) => {
                     return Ok(parse_plugin_request_error_2_warp_rejection(e.into()));
@@ -154,9 +163,18 @@ pub async fn handle_request_with_plugin(
                         msg: "".to_string(),
                         data: r,
                     };
-                    return Ok(get_response_from_string(
-                        serde_json::to_string(&res).unwrap(),
-                    ));
+                    match serde_json::to_string(&res) {
+                        Ok(s) => {
+                            return Ok(get_response_from_string(s));
+                        }
+                        Err(e) => {
+                            #[cfg(debug_assertions)]
+                            logger::error(format!("{:?}", e).as_str());
+                            return Ok(parse_plugin_request_error_2_warp_rejection(
+                                PluginRequestError::new(format!("{:?}", e)),
+                            ));
+                        }
+                    }
                 }
                 Err(e) => {
                     return Ok(parse_plugin_request_error_2_warp_rejection(e.into()));

diff --git a/src/pages/playlist/components/RightDetails/components/BottomList/index.tsx b/src/pages/playlist/components/RightDetails/components/BottomList/index.tsx
@@ -68,9 +68,8 @@ const useControlledMenu = (options: any) => {
 function parseU64Duration2Time(duration: number) {
   const minute = Math.floor(duration / 60000);
   const second = Math.floor((duration % 60000) / 1000);
-  return `${minute < 10 ? '0' + minute : minute}:${
-    second < 10 ? '0' + second : second
-  }`;
+  return `${minute < 10 ? '0' + minute : minute}:${second < 10 ? '0' + second : second
+    }`;
 }
 
 function getTagsBySongCid(cid: string, data: InjectorMetadata[]) {
@@ -105,8 +104,6 @@ const RightDetailsBottomList: FunctionComponent<
     return <PendingTips />;
   }
 
-  console.log(list);
-
   return list.length ? (
     <>
       <Scrollbar