From afbb74f8231a15e5af48ba4dc8390bc2f6144cb5 Mon Sep 17 00:00:00 2001 From: liyuanhu Date: Wed, 7 May 2025 14:43:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BA=86api=20=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 16 +++--- ...install-service-x86_64-pc-windows-msvc.exe | Bin 289792 -> 289792 bytes ...-system-service-x86_64-pc-windows-msvc.exe | Bin 1530880 -> 1530880 bytes ...install-service-x86_64-pc-windows-msvc.exe | Bin 255488 -> 255488 bytes src/pages/new-home/index.tsx | 50 +++++++++--------- src/store/serviceSlice.ts | 1 - 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.env b/.env index 9912402..9727131 100644 --- a/.env +++ b/.env @@ -1,11 +1,11 @@ IS_DEBUG="true" -GRPC_ENDPOINT="10.66.66.234:9090" -COSMOS_ENDPOINT="http://10.66.66.234:26657" -ACCOUNT_NAME="ccvdexre" -TRAFFIC_OBFUSCATE="10.66.66.234:8180" -NODE_SECRET= "initial typical business width enforce buddy magic country piano head cable blossom gate caught disagree pepper moral pair vessel protect mixture deposit artwork liquid" -VIET_EVENTS_URL="ws://10.66.66.234:8080/events" -VITE_BASE_URL="http://10.66.66.234:8080" -VITE_BLOCK_URL="http://10.66.66.234:1317" +GRPC_ENDPOINT="10.66.66.230:9090" +COSMOS_ENDPOINT="http://10.66.66.230:26657" +ACCOUNT_NAME="gmkrucb5apcmq" +TRAFFIC_OBFUSCATE="10.66.66.230:8180" +NODE_SECRET= "horror fence lecture sunset tunnel badge strategy curtain boat wonder police junior spider attack favorite farm trade chicken violin dust strike clap clutch toilet" +VIET_EVENTS_URL="ws://10.66.66.230:8080/events" +VITE_BASE_URL="http://10.66.66.230:8080" +VITE_BLOCK_URL="http://10.66.66.230:1317" NODE_OPTIONS=--max-old-space-size=8192 # $env:NODE_OPTIONS="--max-old-space-size=8192"; pnpm run web:build diff --git a/src-tauri/sidecar/paw-install-service-x86_64-pc-windows-msvc.exe b/src-tauri/sidecar/paw-install-service-x86_64-pc-windows-msvc.exe index d78659ec2c2c682e180cc52de258bf17b0f404bb..06509698afef1c58c195e9ff23887211de40e28c 100644 GIT binary patch delta 114 zcmZp;A=q$3aKaB}_J2~1zgvGZw*F??`kQ&?8Ec?G1_KZ<0kHuP^SohZ;JL&M5@LYK u@c`K(Kx_k)vq8vhKYy0lkwsv=at>o*NU+0Ps{p^Wjf_m&6)rJ9mttHTYocc{mne{j5Saog8>MbfY<|%$mgNv@*d(GIqUEvb*gP8zA03kjA diff --git a/src-tauri/sidecar/paw-system-service-x86_64-pc-windows-msvc.exe b/src-tauri/sidecar/paw-system-service-x86_64-pc-windows-msvc.exe index eaa3c32d3026d1ee1371c21c9de4a0cd271bc895..fd2d95383fb4cd591c0e79b1b8e9a2d255966ffd 100644 GIT binary patch delta 195 zcmZqJ5!I}mdKF((jn0Wmia^8hg~ z5c2^sKM)H5u^MbfY=C#drFuYdXktyLJTlD u9w1u;hz|he4j|;V^T#navIw-C+xTu`zo+Nq9GP_~KQCo$Uy#I{&q@n7#;%-|Vq(jm+D%+YIk*Uy#I{& { }, [dataInfo.applicationDiversion]); // 处理代理开关 - const handleProxyToggle = async ( - isProxyEnabled: boolean, - isCoreRunning: boolean - ) => { - if (isProxyLoading) return; - try { - // 如果核心未运行，先启动核心 - if (!isCoreRunning) { - await commands.startCore(); + const handleProxyToggle = useCallback( + async (isProxyEnabled: boolean, isCoreRunning: boolean) => { + // console.log(isProxyLoading, "isProxyLoadingisProxyLoading"); + if (isProxyLoading) return; + try { + // 如果核心未运行，先启动核心 + if (!isCoreRunning) { + await commands.startCore(); + } + + setIsProxyLoading(true); + // 切换代理状态 + await dispatch(isProxyEnabled ? disableProxy() : enableProxy()).unwrap(); + setIsProxyLoading(false); + console.log(`Proxy ${isProxyEnabled ? "关闭成功" : "开启成功"}`); + } catch (error) { + const errorMessage = isProxyEnabled + ? "关闭代理失败!" + : "开启代理失败，请检查节点配置、或重新尝试开启"; + errorToast(errorMessage, toast); + console.error("Proxy toggle failed:", error); + } finally { + setIsProxyLoading(false); } - - setIsProxyLoading(true); - // 切换代理状态 - await dispatch(isProxyEnabled ? disableProxy() : enableProxy()).unwrap(); - } catch (error) { - const errorMessage = isProxyEnabled - ? "关闭代理失败!" - : "开启代理失败，请检查节点配置、或重新尝试开启"; - errorToast(errorMessage, toast); - console.error("Proxy toggle failed:", error); - } finally { - setIsProxyLoading(false); - } - }; - + }, + [dispatch, isProxyLoading, isCoreRunning, isProxyEnabled] + ); const initData = async () => { const passAuthentication = await getPassAuthentication(); const trafficObfuscation = await getTrafficObfuscation(); diff --git a/src/store/serviceSlice.ts b/src/store/serviceSlice.ts index 6bdbe80..8faef2b 100644 --- a/src/store/serviceSlice.ts +++ b/src/store/serviceSlice.ts @@ -51,7 +51,6 @@ export const stopCore = createAsyncThunk( ) export const enableProxy = createAsyncThunk('service/enableProxy', async () => { - console.log("开启代理了？") const result = await commands.enableProxy() return result })