refactor: clash-verge-service management (#4674)
* refactor: clash-verge-service management * fix: correct service state checks in ProxyControlSwitches component refactor: improve logging in service state update functions * fix: add missing async handler for Windows and adjust logging import for macOS * fix: streamline logging imports and add missing async handler for Windows * refactor: remove unused useServiceStateSync hook and update imports in _layout * refactor: remove unused useServiceStateSync import and clean up code in ProxyControlSwitches and _layout * refactor: simplify service status checks and reduce wait time in useServiceInstaller hook * refactor: remove unnecessary logging statements in service checks and IPC connection * refactor: extract SwitchRow component for better code organization and readability * refactor: enhance service state management and update related mutations in layout * refactor: streamline core stopping logic and improve IPC connection logging * refactor: consolidate service uninstallation logic and improve error handling * fix: simplify conditional statements in CoreManager and service functions * feat: add backoff dependency and implement retry strategy for IPC requests * refactor: remove redundant Windows conditional and improve error handling in IPC tests * test: improve error handling in IPC tests for message signing and verification * fix: adjust IPC backoff retry parameters * refactor: Remove service state tracking and related logic from service management * feat: Enhance service status handling with logging and running mode updates * fix: Improve service status handling with enhanced error logging * fix: Ensure proper handling of service operations with error propagation * refactor: Simplify service operation execution and enhance service status handling * fix: Improve error message formatting in service operation execution and simplify service status retrieval * refactor: Replace Cache with CacheProxy in multiple modules and update CacheEntry to be generic * fix: Remove unnecessary success message from config validation * refactor: Comment out logging statements in service version check and IPC request handling
This commit is contained in:
@@ -15,6 +15,8 @@ export function useSystemState() {
|
||||
revalidateOnFocus: false,
|
||||
},
|
||||
);
|
||||
const isSidecarMode = runningMode === "Sidecar";
|
||||
const isServiceMode = runningMode === "Service";
|
||||
|
||||
// 获取管理员状态
|
||||
const { data: isAdminMode = false } = useSWR("isAdmin", isAdmin, {
|
||||
@@ -22,24 +24,32 @@ export function useSystemState() {
|
||||
revalidateOnFocus: false,
|
||||
});
|
||||
|
||||
// 获取系统服务状态
|
||||
const isServiceMode = runningMode === "Service";
|
||||
const { data: isServiceOk = false } = useSWR(
|
||||
const { data: isServiceOk = false, mutate: mutateServiceOk } = useSWR(
|
||||
"isServiceAvailable",
|
||||
isServiceAvailable,
|
||||
{
|
||||
suspense: false,
|
||||
revalidateOnFocus: false,
|
||||
isPaused: () => !isServiceMode, // 仅在 Service 模式下请求
|
||||
onSuccess: (data) => {
|
||||
console.log("[useSystemState] 服务状态更新:", data);
|
||||
},
|
||||
onError: (error) => {
|
||||
console.error("[useSystemState] 服务状态检查失败:", error);
|
||||
},
|
||||
isPaused: () => !isServiceMode, // 仅在非 Service 模式下暂停请求
|
||||
},
|
||||
);
|
||||
|
||||
const isTunModeAvailable = isAdminMode || isServiceOk;
|
||||
|
||||
return {
|
||||
runningMode,
|
||||
isAdminMode,
|
||||
isSidecarMode: runningMode === "Sidecar",
|
||||
isServiceMode: runningMode === "Service",
|
||||
isSidecarMode,
|
||||
isServiceMode,
|
||||
isServiceOk,
|
||||
isTunModeAvailable: isTunModeAvailable,
|
||||
mutateRunningMode,
|
||||
mutateServiceOk,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user