root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: improve initialization logic to prevent duplicated initialization and improve logging in Layout component

Browse Source
This commit is contained in:
Tunglies
2025-05-21 00:22:47 +08:00
parent b6db209670
commit d60c3b4d64
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/pages/_layout.tsx
View File

@@ -2,7 +2,7 @@ import dayjs from "dayjs";
import i18next from "i18next"; import i18next from "i18next";
import relativeTime from "dayjs/plugin/relativeTime"; import relativeTime from "dayjs/plugin/relativeTime";
import { SWRConfig, mutate } from "swr"; import { SWRConfig, mutate } from "swr";
import { useEffect, useCallback } from "react"; import { useEffect, useCallback, useState, useRef } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useLocation, useRoutes, useNavigate } from "react-router-dom"; import { useLocation, useRoutes, useNavigate } from "react-router-dom";
import { List, Paper, ThemeProvider, SvgIcon } from "@mui/material"; import { List, Paper, ThemeProvider, SvgIcon } from "@mui/material";
@@ -150,6 +150,7 @@ const Layout = () => {
const location = useLocation(); const location = useLocation();
const routersEles = useRoutes(routers); const routersEles = useRoutes(routers);
const { addListener, setupCloseListener } = useListen(); const { addListener, setupCloseListener } = useListen();
const initRef = useRef(false);
const handleNotice = useCallback( const handleNotice = useCallback(
(payload: [string, string]) => { (payload: [string, string]) => {
@@ -215,53 +216,60 @@ const Layout = () => {
}, [handleNotice]); }, [handleNotice]);
useEffect(() => { useEffect(() => {
if (initRef.current) {
console.log("[Layout] 初始化代码已执行过，跳过");
return;
}
console.log("[Layout] 开始执行初始化代码");
initRef.current = true;
const notifyUiStage = async (stage: string) => { const notifyUiStage = async (stage: string) => {
try { try {
console.log(`UI加载阶段: ${stage}`); console.log(`[Layout] UI加载阶段: ${stage}`);
await invoke("update_ui_stage", { stage }); await invoke("update_ui_stage", { stage });
} catch (err) { } catch (err) {
console.error(`通知UI加载阶段(${stage})失败:`, err); console.error(`[Layout] 通知UI加载阶段(${stage})失败:`, err);
} }
}; };
const notifyUiCoreReady = async () => { const notifyUiCoreReady = async () => {
try { try {
console.log("核心组件已加载，通知后端"); console.log("[Layout] 核心组件已加载，通知后端");
await invoke("update_ui_stage", { stage: "DomReady" }); await invoke("update_ui_stage", { stage: "DomReady" });
} catch (err) { } catch (err) {
console.error("通知核心组件加载完成失败:", err); console.error("[Layout] 通知核心组件加载完成失败:", err);
} }
}; };
const notifyUiResourcesLoaded = async () => { const notifyUiResourcesLoaded = async () => {
try { try {
console.log("所有资源已加载，通知后端"); console.log("[Layout] 所有资源已加载，通知后端");
await invoke("update_ui_stage", { stage: "ResourcesLoaded" }); await invoke("update_ui_stage", { stage: "ResourcesLoaded" });
} catch (err) { } catch (err) {
console.error("通知资源加载完成失败:", err); console.error("[Layout] 通知资源加载完成失败:", err);
} }
}; };
const notifyUiReady = async () => { const notifyUiReady = async () => {
try { try {
console.log("UI完全准备就绪，通知后端"); console.log("[Layout] UI完全准备就绪，通知后端");
await invoke("notify_ui_ready"); await invoke("notify_ui_ready");
} catch (err) { } catch (err) {
console.error("通知UI准备就绪失败:", err); console.error("[Layout] 通知UI准备就绪失败:", err);
} }
}; };
// 监听后端发送的启动完成事件 // 监听后端发送的启动完成事件
const listenStartupCompleted = async () => { const listenStartupCompleted = async () => {
try { try {
console.log("开始监听启动完成事件"); console.log("[Layout] 开始监听启动完成事件");
const unlisten = await listen("verge://startup-completed", () => { const unlisten = await listen("verge://startup-completed", () => {
console.log("收到启动完成事件，开始通知UI就绪"); console.log("[Layout] 收到启动完成事件，开始通知UI就绪");
notifyUiReady(); notifyUiReady();
}); });
return unlisten; return unlisten;
} catch (err) { } catch (err) {
console.error("监听启动完成事件失败:", err); console.error("[Layout] 监听启动完成事件失败:", err);
return () => {}; return () => {};
} }
}; };