Revert Use Tauri Http Api

src-tauri/tauri.conf.json

@@ -54,10 +54,6 @@
       },
       "notification": {
         "all": true
-      },
-      "http": {
-        "all": true,
-        "scope": ["http://**", "https://**"]
       }
     },
     "windows": [],

src/hooks/use-clash.ts

@@ -1,7 +1,7 @@
 import useSWR, { mutate } from "swr";
 import { useLockFn } from "ahooks";
 import {
-  refreshClashInfo,
+  getAxios,
   getClashConfig,
   getVersion,
   updateConfigs,
@@ -72,7 +72,7 @@ export const useClashInfo = () => {
     mutateInfo();
     mutate("getClashConfig");
     // 刷新接口
-    await refreshClashInfo();
+    getAxios(true);
   };
 
   return {

src/pages/_layout.tsx

@@ -10,7 +10,7 @@ import { alpha, List, Paper, ThemeProvider } from "@mui/material";
 import { listen } from "@tauri-apps/api/event";
 import { appWindow } from "@tauri-apps/api/window";
 import { routers } from "./_routers";
-import { refreshClashInfo } from "@/services/api";
+import { getAxios } from "@/services/api";
 import { useVerge } from "@/hooks/use-verge";
 import LogoSvg from "@/assets/image/logo.svg?react";
 import { BaseErrorBoundary, Notice } from "@/components/base";
@@ -50,7 +50,7 @@ const Layout = () => {
 
     listen("verge://refresh-clash-config", async () => {
       // the clash info may be updated
-      await refreshClashInfo();
+      await getAxios(true);
       mutate("getProxies");
       mutate("getVersion");
       mutate("getClashConfig");

src/services/api.ts

@@ -1,30 +1,22 @@
+import axios, { AxiosInstance } from "axios";
 import { getClashInfo } from "./cmds";
-import {
-  fetch as tauriFetch,
-  HttpVerb,
-  Body,
-  Response,
-} from "@tauri-apps/api/http";
-let clashInfo: IClashInfo | null;
 
-export const refreshClashInfo = async () => {
+let axiosIns: AxiosInstance = null!;
-  clashInfo = await getClashInfo();
+
-  return clashInfo;
+/// initialize some information
-};
+/// enable force update axiosIns
+export const getAxios = async (force: boolean = false) => {
+  if (axiosIns && !force) return axiosIns;
 
-export const fetch = async (
-  path: string,
-  method: HttpVerb,
-  body?: any
-): Promise<Response<any>> => {
   let server = "";
   let secret = "";
 
   try {
-    const info = clashInfo ?? (await refreshClashInfo());
+    const info = await getClashInfo();
 
     if (info?.server) {
       server = info.server;
+
       // compatible width `external-controller`
       if (server.startsWith(":")) server = `127.0.0.1${server}`;
       else if (/^\d+$/.test(server)) server = `127.0.0.1:${server}`;
@@ -32,18 +24,19 @@ export const fetch = async (
     if (info?.secret) secret = info?.secret;
   } catch {}
 
-  return tauriFetch(`http://${server}${path}`, {
+  axiosIns = axios.create({
-    method,
+    baseURL: `http://${server}`,
     headers: secret ? { Authorization: `Bearer ${secret}` } : {},
     timeout: 15000,
-    body: body ? Body.json(body) : undefined,
   });
+  axiosIns.interceptors.response.use((r) => r.data);
+  return axiosIns;
 };
 
 /// Get Version
 export const getVersion = async () => {
-  const res = await fetch("/version", "GET");
+  const instance = await getAxios();
-  return res.data as Promise<{
+  return instance.get("/version") as Promise<{
     premium: boolean;
     meta?: boolean;
     version: string;
@@ -52,32 +45,33 @@ export const getVersion = async () => {
 
 /// Get current base configs
 export const getClashConfig = async () => {
-  const res = await fetch("/configs", "GET");
+  const instance = await getAxios();
-  return res.data as Promise<IConfigData>;
+  return instance.get("/configs") as Promise<IConfigData>;
 };
 
 /// Update current configs
 export const updateConfigs = async (config: Partial<IConfigData>) => {
-  const res = await fetch("/configs", "PATCH", config);
+  const instance = await getAxios();
-  return res;
+  return instance.patch("/configs", config);
 };
 
 /// Update geo data
 export const updateGeoData = async () => {
-  const res = await fetch("/configs/geo", "POST");
+  const instance = await getAxios();
-  return res;
+  return instance.post("/configs/geo");
 };
 
 /// Upgrade clash core
 export const upgradeCore = async () => {
-  const res = await fetch("/upgrade", "POST");
+  const instance = await getAxios();
-  return res;
+  return instance.post("/upgrade");
 };
 
 /// Get current rules
 export const getRules = async () => {
-  const res = await fetch("/rules", "GET");
+  const instance = await getAxios();
-  return res?.data?.rules as IRuleItem[];
+  const response = await instance.get<any, any>("/rules");
+  return response?.rules as IRuleItem[];
 };
 
 /// Get Proxy delay
@@ -86,26 +80,25 @@ export const getProxyDelay = async (name: string, url?: string) => {
     timeout: 10000,
     url: url || "http://1.1.1.1",
   };
-  const result = await fetch(
+  const instance = await getAxios();
+  const result = await instance.get(
     `/proxies/${encodeURIComponent(name)}/delay`,
-    "GET",
     { params }
   );
-  return result.data as any as { delay: number };
+  return result as any as { delay: number };
 };
 
 /// Update the Proxy Choose
 export const updateProxy = async (group: string, proxy: string) => {
-  const res = await fetch(`/proxies/${encodeURIComponent(group)}`, "PUT", {
+  const instance = await getAxios();
-    name: proxy,
+  return instance.put(`/proxies/${encodeURIComponent(group)}`, { name: proxy });
-  });
-  return res;
 };
 
 // get proxy
 export const getProxiesInner = async () => {
-  const res = await fetch("/proxies", "GET");
+  const instance = await getAxios();
-  return (res?.data?.proxies || {}) as Record<string, IProxyItem>;
+  const response = await instance.get<any, any>("/proxies");
+  return (response?.proxies || {}) as Record<string, IProxyItem>;
 };
 
 /// Get the Proxy information
@@ -174,8 +167,10 @@ export const getProxies = async () => {
 
 // get proxy providers
 export const getProviders = async () => {
-  const res = await fetch("/providers/proxies", "GET");
+  const instance = await getAxios();
-  const providers = (res.data.providers || {}) as Record<string, IProviderItem>;
+  const response = await instance.get<any, any>("/providers/proxies");
+
+  const providers = (response.providers || {}) as Record<string, IProviderItem>;
 
   return Object.fromEntries(
     Object.entries(providers).filter(([key, item]) => {
@@ -187,34 +182,31 @@ export const getProviders = async () => {
 
 // proxy providers health check
 export const providerHealthCheck = async (name: string) => {
-  const res = await fetch(
+  const instance = await getAxios();
-    `/providers/proxies/${encodeURIComponent(name)}/healthcheck`,
+  return instance.get(
-    "GET"
+    `/providers/proxies/${encodeURIComponent(name)}/healthcheck`
   );
-  return res;
 };
 
 export const providerUpdate = async (name: string) => {
-  const res = await fetch(
+  const instance = await getAxios();
-    `/providers/proxies/${encodeURIComponent(name)}`,
+  return instance.put(`/providers/proxies/${encodeURIComponent(name)}`);
-    "PUT"
-  );
-  return res;
 };
 
 export const getConnections = async () => {
-  const res = await fetch("/connections", "GET");
+  const instance = await getAxios();
-  return res.data as any as IConnections;
+  const result = await instance.get("/connections");
+  return result as any as IConnections;
 };
 
 // Close specific connection
 export const deleteConnection = async (id: string) => {
-  const res = await fetch(`/connections/${encodeURIComponent(id)}`, "DELETE");
+  const instance = await getAxios();
-  return res;
+  await instance.delete<any, any>(`/connections/${encodeURIComponent(id)}`);
 };
 
 // Close all connections
 export const closeAllConnections = async () => {
-  const res = await fetch("/connections", "DELETE");
+  const instance = await getAxios();
-  return res;
+  await instance.delete<any, any>(`/connections`);
 };