refactor: profile switch (#5197)
* refactor: proxy refresh
* fix(proxy-store): properly hydrate and filter backend provider snapshots
* fix(proxy-store): add monotonic fetch guard and event bridge cleanup
* fix(proxy-store): tweak fetch sequencing guard to prevent snapshot invalidation from wiping fast responses
* docs: UPDATELOG.md
* fix(proxy-snapshot, proxy-groups): restore last-selected proxy and group info
* fix(proxy): merge static and provider entries in snapshot; fix Virtuoso viewport height
* fix(proxy-groups): restrict reduced-height viewport to chain-mode column
* refactor(profiles): introduce a state machine
* refactor：replace state machine with reducer
* refactor：introduce a profile switch worker
* refactor: hooked up a backend-driven profile switch flow
* refactor(profile-switch): serialize switches with async queue and enrich frontend events
* feat(profiles): centralize profile switching with reducer/driver queue to fix stuck UI on rapid toggles
* chore: translate comments and log messages to English to avoid encoding issues
* refactor: migrate backend queue to SwitchDriver actor
* fix(profile): unify error string types in validation helper
* refactor(profile): make switch driver fully async and handle panics safely
* refactor(cmd): move switch-validation helper into new profile_switch module
* refactor(profile): modularize switch logic into profile_switch.rs
* refactor(profile_switch): modularize switch handler
- Break monolithic switch handler into proper module hierarchy
- Move shared globals, constants, and SwitchScope guard to state.rs
- Isolate queue orchestration and async task spawning in driver.rs
- Consolidate switch pipeline and config patching in workflow.rs
- Extract request pre-checks/YAML validation into validation.rs
* refactor(profile_switch): centralize state management and add cancellation flow
- Introduced SwitchManager in state.rs to unify mutex, sequencing, and SwitchScope handling.
- Added SwitchCancellation and SwitchRequest wrappers to encapsulate cancel tokens and notifications.
- Updated driver to allocate task IDs via SwitchManager, cancel old tokens, and queue next jobs in order.
- Updated workflow to check cancellation and sequence at each phase, replacing global flags with manager APIs.
* feat(profile_switch): integrate explicit state machine for profile switching
- workflow.rs:24 now delegates each switch to SwitchStateMachine, passing an owned SwitchRequest.
Queue cancellation and state-sequence checks are centralized inside the machine instead of scattered guards.
- workflow.rs:176 replaces the old helper with `SwitchStateMachine::new(manager(), None, profiles).run().await`,
ensuring manual profile patches follow the same workflow (locking, validation, rollback) as queued switches.
- workflow.rs:180 & 275 expose `validate_profile_yaml` and `restore_previous_profile` for reuse inside the state machine.
- workflow/state_machine.rs:1 introduces a dedicated state machine module.
It manages global mutex acquisition, request/cancellation state, YAML validation, draft patching,
`CoreManager::update_config`, failure rollback, and tray/notification side-effects.
Transitions check for cancellations and stale sequences; completions release guards via `SwitchScope` drop.
* refactor(profile-switch): integrate stage-aware panic handling
- src-tauri/src/cmd/profile_switch/workflow/state_machine.rs:1
Defines SwitchStage and SwitchPanicInfo as crate-visible, wraps each transition in with_stage(...) with catch_unwind, and propagates CmdResult<bool> to distinguish validation failures from panics while keeping cancellation semantics.
- src-tauri/src/cmd/profile_switch/workflow.rs:25
Updates run_switch_job to return Result<bool, SwitchPanicInfo>, routing timeout, validation, config, and stage panic cases separately. Reuses SwitchPanicInfo for logging/UI notifications; patch_profiles_config maps state-machine panics into user-facing error strings.
- src-tauri/src/cmd/profile_switch/driver.rs:1
Adds SwitchJobOutcome to unify workflow results: normal completions carry bool, and panics propagate SwitchPanicInfo. The driver loop now logs panics explicitly and uses AssertUnwindSafe(...).catch_unwind() to guard setup-phase panics.
* refactor(profile-switch): add watchdog, heartbeat, and async timeout guards
- Introduce SwitchHeartbeat for stage tracking and timing; log stage transitions with elapsed durations.
- Add watchdog in driver to cancel stalled switches (5s heartbeat timeout).
- Wrap blocking ops (Config::apply, tray updates, profiles_save_file_safe, etc.) with time::timeout to prevent async stalls.
- Improve logs for stage transitions and watchdog timeouts to clarify cancellation points.
* refactor(profile-switch): async post-switch tasks, early lock release, and spawn_blocking for IO
* feat(profile-switch): track cleanup and coordinate pipeline
- Add explicit cleanup tracking in the driver (`cleanup_profiles` map + `CleanupDone` messages) to know when background post-switch work is still running before starting a new workflow. (driver.rs:29-50)
- Update `handle_enqueue` to detect “cleanup in progress”: same-profile retries are short-circuited; other requests collapse the pending queue, cancelling old tokens so only the latest intent survives. (driver.rs:176-247)
- Rework scheduling helpers: `start_next_job` refuses to start while cleanup is outstanding; discarded requests release cancellation tokens; cleanup completion explicitly restarts the pipeline. (driver.rs:258-442)
* feat(profile-switch): unify post-switch cleanup handling
- workflow.rs (25-427) returns `SwitchWorkflowResult` (success + CleanupHandle) or `SwitchWorkflowError`.
All failure/timeout paths stash post-switch work into a single CleanupHandle.
Cleanup helpers (`notify_profile_switch_finished` and `close_connections_after_switch`) run inside that task for proper lifetime handling.
- driver.rs (29-439) propagates CleanupHandle through `SwitchJobOutcome`, spawns a bridge to wait for completion, and blocks `start_next_job` until done.
Direct driver-side panics now schedule failure cleanup via the shared helper.
* tmp
* Revert "tmp"
This reverts commit e582cf4a65.
* refactor: queue frontend events through async dispatcher
* refactor: queue frontend switch/proxy events and throttle notices
* chore: frontend debug log
* fix: re-enable only ProfileSwitchFinished events - keep others suppressed for crash isolation
- Re-enabled only ProfileSwitchFinished events; RefreshClash, RefreshProxy, and ProfileChanged remain suppressed (they log suppression messages)
- Allows frontend to receive task completion notifications for UI feedback while crash isolation continues
- src-tauri/src/core/handle.rs now only suppresses notify_profile_changed
- Serialized emitter, frontend logging bridge, and other diagnostics unchanged
* refactor: refreshClashData
* refactor(proxy): stabilize proxy switch pipeline and rendering
- Add coalescing buffer in notification.rs to emit only the latest proxies-updated snapshot
- Replace nextTick with queueMicrotask in asyncQueue.ts for same-frame hydration
- Hide auto-generated GLOBAL snapshot and preserve optional metadata in proxy-snapshot.ts
- Introduce stable proxy rendering state in AppDataProvider (proxyTargetProfileId, proxyDisplayProfileId, isProxyRefreshPending)
- Update proxy page to fade content during refresh and overlay status banner instead of showing incomplete snapshot
* refactor(profiles): move manual activating logic to reducer for deterministic queue tracking
* refactor: replace proxy-data event bridge with pure polling and simplify proxy store
- Replaced the proxy-data event bridge with pure polling: AppDataProvider now fetches the initial snapshot and drives refreshes from the polled switchStatus, removing verge://refresh-* listeners (src/providers/app-data-provider.tsx).
- Simplified proxy-store by dropping the proxies-updated listener queue and unused payload/normalizer helpers; relies on SWR/provider fetch path + calcuProxies for live updates (src/stores/proxy-store.ts).
- Trimmed layout-level event wiring to keep only notice/show/hide subscriptions, removing obsolete refresh listeners (src/pages/_layout/useLayoutEvents.ts).
* refactor(proxy): streamline proxies-updated handling and store event flow
- AppDataProvider now treats `proxies-updated` as the fast path: the listener
calls `applyLiveProxyPayload` immediately and schedules only a single fallback
`fetchLiveProxies` ~600 ms later (replacing the old 0/250/1000/2000 cascade).
Expensive provider/rule refreshes run in parallel via `Promise.allSettled`, and
the multi-stage queue on profile updates completion was removed
(src/providers/app-data-provider.tsx).
- Rebuilt proxy-store to support the event flow: restored `setLive`, provider
normalization, and an animation-frame + async queue that applies payloads without
blocking. Exposed `applyLiveProxyPayload` so providers can push events directly
into the store (src/stores/proxy-store.ts).
* refactor: switch delay
* refactor(app-data-provider): trigger getProfileSwitchStatus revalidation on profile-switch-finished
- AppDataProvider now listens to `profile-switch-finished` and calls `mutate("getProfileSwitchStatus")` to immediately update state and unlock buttons (src/providers/app-data-provider.tsx).
- Retain existing detailed timing logs for monitoring other stages.
- Frontend success notifications remain instant; background refreshes continue asynchronously.
* fix(profiles): prevent duplicate toast on page remount
* refactor(profile-switch): make active switches preemptible and prevent queue piling
- Add notify mechanism to SwitchCancellation to await cancellation without busy-waiting (state.rs:82)
- Collapse pending queue to a single entry in the driver; cancel in-flight task on newer request (driver.rs:232)
- Update handle_update_core to watch cancel token and 30s timeout; release locks, discard draft, and exit early if canceled (state_machine.rs:301)
- Providers revalidate status immediately on profile-switch-finished events (app-data-provider.tsx:208)
* refactor(core): make core reload phase controllable, reduce 0xcfffffff risk
- CoreManager::apply_config now calls `reload_config_with_retry`, each attempt waits up to 5s, retries 3 times; on failure, returns error with duration logged and triggers core restart if needed (src-tauri/src/core/manager/config.rs:175, 205)
- `reload_config_with_retry` logs attempt info on timeout or error; if error is a Mihomo connection issue, fallback to original restart logic (src-tauri/src/core/manager/config.rs:211)
- `reload_config_once` retains original Mihomo call for retry wrapper usage (src-tauri/src/core/manager/config.rs:247)
* chore(frontend-logs): downgrade routine event logs from info to debug
- Logs like `emit_via_app entering spawn_blocking`, `Async emit…`, `Buffered proxies…` are now debug-level (src-tauri/src/core/notification.rs:155, :265, :309…)
- Genuine warnings/errors (failures/timeouts) remain at warn/error
- Core stage logs remain info to keep backend tracking visible
* refactor(frontend-emit): make emit_via_app fire-and-forget async
- `emit_via_app` now a regular function; spawns with `tokio::spawn` and logs a warn if `emit_to` fails, caller returns immediately (src-tauri/src/core/notification.rs:269)
- Removed `.await` at Async emit and flush_proxies calls; only record dispatch duration and warn on failure (src-tauri/src/core/notification.rs:211, :329)
* refactor(ui): restructure profile switch for event-driven speed + polling stability
- Backend
- SwitchManager maintains a lightweight event queue: added `event_sequence`, `recent_events`, and `SwitchResultEvent`; provides `push_event` / `events_after` (state.rs)
- `handle_completion` pushes events on success/failure and keeps `last_result` (driver.rs) for frontend incremental fetch
- New Tauri command `get_profile_switch_events(after_sequence)` exposes `events_after` (profile_switch/mod.rs → profile.rs → lib.rs)
- Notification system
- `NotificationSystem::process_event` only logs debug, disables WebView `emit_to`, fixes 0xcfffffff
- Related emit/buffer functions now safe no-op, removed unused structures and warnings (notification.rs)
- Frontend
- services/cmds.ts defines `SwitchResultEvent` and `getProfileSwitchEvents`
- `AppDataProvider` holds `switchEventSeqRef`, polls incremental events every 0.25s (busy) / 1s (idle); each event triggers:
- immediate `globalMutate("getProfiles")` to refresh current profile
- background refresh of proxies/providers/rules via `Promise.allSettled` (failures logged, non-blocking)
- forced `mutateSwitchStatus` to correct state
- original switchStatus effect calls `handleSwitchResult` as fallback; other toast/activation logic handled in profiles.tsx
- Commands / API cleanup
- removed `pub use profile_switch::*;` in cmd::mod.rs to avoid conflicts; frontend uses new command polling
* refactor(frontend): optimize profile switch with optimistic updates
* refactor(profile-switch): switch to event-driven flow with Profile Store
- SwitchManager pushes events; frontend polls get_profile_switch_events
- Zustand store handles optimistic profiles; AppDataProvider applies updates and background-fetches
- UI flicker removed
* fix(app-data): re-hook profile store updates during switch hydration
* fix(notification): restore frontend event dispatch and non-blocking emits
* fix(app-data-provider): restore proxy refresh and seed snapshot after refactor
* fix: ensure switch completion events are received and handle proxies-updated
* fix(app-data-provider): dedupe switch results by taskId and fix stale profile state
* fix(profile-switch): ensure patch_profiles_config_by_profile_index waits for real completion and handle join failures in apply_config_with_timeout
* docs: UPDATELOG.md
* chore: add necessary comments
* fix(core): always dispatch async proxy snapshot after RefreshClash event
* fix(proxy-store, provider): handle pending snapshots and proxy profiles
- Added pending snapshot tracking in proxy-store so `lastAppliedFetchId` no longer jumps on seed. Profile adoption is deferred until a qualifying fetch completes. Exposed `clearPendingProfile` for rollback support.
- Cleared pending snapshot state whenever live payloads apply or the store resets, preventing stale optimistic profile IDs after failures.
- In provider integration, subscribed to the pending proxy profile and fed it into target-profile derivation. Cleared it on failed switch results so hydration can advance and UI status remains accurate.
* fix(proxy): re-hook tray refresh events into proxy refresh queue
- Reattached listen("verge://refresh-proxy-config", …) at src/providers/app-data-provider.tsx:402 and registered it for cleanup.
- Added matching window fallback handler at src/providers/app-data-provider.tsx:430 so in-app dispatches share the same refresh path.
* fix(proxy-snapshot/proxy-groups): address review findings on snapshot placeholders
- src/utils/proxy-snapshot.ts:72-95 now derives snapshot group members solely from proxy-groups.proxies, so provider ids under `use` no longer generate placeholder proxy items.
- src/components/proxy/proxy-groups.tsx:665-677 lets the hydration overlay capture pointer events (and shows a wait cursor) so users can’t interact with snapshot-only placeholders before live data is ready.
* fix(profile-switch): preserve queued requests and avoid stale connection teardown
- Keep earlier queued switches intact by dropping the blanket “collapse” call: after removing duplicates for the same profile, new requests are simply appended, leaving other profiles pending (driver.rs:376). Resolves queue-loss scenario.
- Gate connection cleanup on real successes so cancelled/stale runs no longer tear down Mihomo connections; success handler now skips close_connections_after_switch when success == false (workflow.rs:419).
* fix(profile-switch, layout): improve profile validation and restore backend refresh
- Hardened profile validation using `tokio::fs` with a 5s timeout and offloading YAML parsing to `AsyncHandler::spawn_blocking`, preventing slow disks or malformed files from freezing the runtime (src-tauri/src/cmd/profile_switch/validation.rs:9, 71).
- Restored backend-triggered refresh handling by listening for `verge://refresh-clash-config` / `verge://refresh-verge-config` and invoking shared refresh services so SWR caches stay in sync with core events (src/pages/_layout/useLayoutEvents.ts:6, 45, 55).
* feat(profile-switch): handle cancellations for superseded requests
- Added a `cancelled` flag and constructor so superseded requests publish an explicit cancellation instead of a failure (src-tauri/src/cmd/profile_switch/state.rs:249, src-tauri/src/cmd/profile_switch/driver.rs:482)
- Updated the profile switch effect to log cancellations as info, retain the shared `mutate` call, and skip emitting error toasts while still refreshing follow-up work (src/pages/profiles.tsx:554, src/pages/profiles.tsx:581)
- Exposed the new flag on the TypeScript contract to keep downstream consumers type-safe (src/services/cmds.ts:20)
* fix(profiles): wrap logging payload for Tauri frontend_log
* fix(profile-switch): add rollback and error propagation for failed persistence
- Added rollback on apply failure so Mihomo restores to the previous profile
before exiting the success path early (state_machine.rs:474).
- Reworked persist_profiles_with_timeout to surface timeout/join/save errors,
convert them into CmdResult failures, and trigger rollback + error propagation
when persistence fails (state_machine.rs:703).
* fix(profile-switch): prevent mid-finalize reentrancy and lingering tasks
* fix(profile-switch): preserve pending queue and surface discarded switches
* fix(profile-switch): avoid draining Mihomo sockets on failed/cancelled switches
* fix(app-data-provider): restore backend-driven refresh and reattach fallbacks
* fix(profile-switch): queue concurrent updates and add bounded wait/backoff
* fix(proxy): trigger live refresh on app start for proxy snapshot
* refactor(profile-switch): split flow into layers and centralize async cleanup
- Introduced `SwitchDriver` to encapsulate queue and driver logic while keeping the public Tauri command API.
- Added workflow/cleanup helpers for notification dispatch and Mihomo connection draining, re-exported for API consistency.
- Replaced monolithic state machine with `core.rs`, `context.rs`, and `stages.rs`, plus a thin `mod.rs` re-export layer; stage methods are now individually testable.
- Removed legacy `workflow/state_machine.rs` and adjusted visibility on re-exported types/constants to ensure compilation.
This commit is contained in:
Sline
GitHub
@@ -100,10 +100,12 @@ export const CurrentProxyCard = () => {
|
||||
const { t } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const theme = useTheme();
|
||||
const { proxies, clashConfig, refreshProxy, rules } = useAppData();
|
||||
const { proxies, proxyHydration, clashConfig, refreshProxy, rules } =
|
||||
useAppData();
|
||||
const { verge } = useVerge();
|
||||
const { current: currentProfile } = useProfiles();
|
||||
const autoDelayEnabled = verge?.enable_auto_delay_detection ?? false;
|
||||
const isLiveHydration = proxyHydration === "live";
|
||||
const currentProfileId = currentProfile?.uid || null;
|
||||
|
||||
const getProfileStorageKey = useCallback(
|
||||
@@ -715,7 +717,6 @@ export const CurrentProxyCard = () => {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
refreshProxy();
|
||||
if (sortType === 1) {
|
||||
setDelaySortRefresh((prev) => prev + 1);
|
||||
@@ -840,13 +841,24 @@ export const CurrentProxyCard = () => {
|
||||
iconColor={currentProxy ? "primary" : undefined}
|
||||
action={
|
||||
<Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
|
||||
{!isLiveHydration && (
|
||||
<Chip
|
||||
size="small"
|
||||
color={proxyHydration === "snapshot" ? "warning" : "info"}
|
||||
label={
|
||||
proxyHydration === "snapshot"
|
||||
? t("Snapshot data")
|
||||
: t("Syncing...")
|
||||
}
|
||||
/>
|
||||
)}
|
||||
<Tooltip title={t("Delay check")}>
|
||||
<span>
|
||||
<IconButton
|
||||
size="small"
|
||||
color="inherit"
|
||||
onClick={handleCheckDelay}
|
||||
disabled={isDirectMode}
|
||||
disabled={isDirectMode || !isLiveHydration}
|
||||
>
|
||||
<NetworkCheckRounded />
|
||||
</IconButton>
|
||||
@@ -960,7 +972,7 @@ export const CurrentProxyCard = () => {
|
||||
value={state.selection.group}
|
||||
onChange={handleGroupChange}
|
||||
label={t("Group")}
|
||||
disabled={isGlobalMode || isDirectMode}
|
||||
disabled={isGlobalMode || isDirectMode || !isLiveHydration}
|
||||
>
|
||||
{state.proxyData.groups.map((group) => (
|
||||
<MenuItem key={group.name} value={group.name}>
|
||||
@@ -978,7 +990,7 @@ export const CurrentProxyCard = () => {
|
||||
value={state.selection.proxy}
|
||||
onChange={handleProxyChange}
|
||||
label={t("Proxy")}
|
||||
disabled={isDirectMode}
|
||||
disabled={isDirectMode || !isLiveHydration}
|
||||
renderValue={renderProxyValue}
|
||||
MenuProps={{
|
||||
PaperProps: {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { RefreshRounded, StorageOutlined } from "@mui/icons-material";
|
||||
import {
|
||||
Box,
|
||||
Chip,
|
||||
Button,
|
||||
Dialog,
|
||||
DialogActions,
|
||||
@@ -18,7 +19,7 @@ import {
|
||||
} from "@mui/material";
|
||||
import { useLockFn } from "ahooks";
|
||||
import dayjs from "dayjs";
|
||||
import { useState } from "react";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { updateProxyProvider } from "tauri-plugin-mihomo-api";
|
||||
|
||||
@@ -48,29 +49,61 @@ const parseExpire = (expire?: number) => {
|
||||
export const ProviderButton = () => {
|
||||
const { t } = useTranslation();
|
||||
const [open, setOpen] = useState(false);
|
||||
const { proxyProviders, refreshProxy, refreshProxyProviders } = useAppData();
|
||||
const {
|
||||
proxyProviders,
|
||||
proxyHydration,
|
||||
refreshProxy,
|
||||
refreshProxyProviders,
|
||||
} = useAppData();
|
||||
|
||||
const isHydrating = proxyHydration !== "live";
|
||||
const [updating, setUpdating] = useState<Record<string, boolean>>({});
|
||||
|
||||
// 检查是否有提供者
|
||||
const hasProviders = Object.keys(proxyProviders || {}).length > 0;
|
||||
|
||||
// Hydration hint badge keeps users aware of sync state
|
||||
const hydrationChip = useMemo(() => {
|
||||
if (proxyHydration === "live") return null;
|
||||
|
||||
return (
|
||||
<Chip
|
||||
size="small"
|
||||
color={proxyHydration === "snapshot" ? "warning" : "info"}
|
||||
label={
|
||||
proxyHydration === "snapshot"
|
||||
? t("Snapshot data")
|
||||
: t("Proxy data is syncing, please wait")
|
||||
}
|
||||
sx={{ fontWeight: 500 }}
|
||||
/>
|
||||
);
|
||||
}, [proxyHydration, t]);
|
||||
|
||||
// 更新单个代理提供者
|
||||
const updateProvider = useLockFn(async (name: string) => {
|
||||
if (isHydrating) {
|
||||
showNotice("info", t("Proxy data is syncing, please wait"));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 设置更新状态
|
||||
setUpdating((prev) => ({ ...prev, [name]: true }));
|
||||
|
||||
await updateProxyProvider(name);
|
||||
|
||||
// 刷新数据
|
||||
await refreshProxy();
|
||||
await refreshProxyProviders();
|
||||
|
||||
showNotice("success", `${name} 更新成功`);
|
||||
await refreshProxy();
|
||||
showNotice(
|
||||
"success",
|
||||
t("Provider {{name}} updated successfully", { name }),
|
||||
);
|
||||
} catch (err: any) {
|
||||
showNotice(
|
||||
"error",
|
||||
`${name} 更新失败: ${err?.message || err.toString()}`,
|
||||
t("Provider {{name}} update failed: {{message}}", {
|
||||
name,
|
||||
message: err?.message || err.toString(),
|
||||
}),
|
||||
);
|
||||
} finally {
|
||||
// 清除更新状态
|
||||
@@ -80,11 +113,16 @@ export const ProviderButton = () => {
|
||||
|
||||
// 更新所有代理提供者
|
||||
const updateAllProviders = useLockFn(async () => {
|
||||
if (isHydrating) {
|
||||
showNotice("info", t("Proxy data is syncing, please wait"));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 获取所有provider的名称
|
||||
const allProviders = Object.keys(proxyProviders || {});
|
||||
if (allProviders.length === 0) {
|
||||
showNotice("info", "没有可更新的代理提供者");
|
||||
showNotice("info", t("No providers to update"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -110,54 +148,67 @@ export const ProviderButton = () => {
|
||||
}
|
||||
}
|
||||
|
||||
// 刷新数据
|
||||
await refreshProxy();
|
||||
await refreshProxyProviders();
|
||||
|
||||
showNotice("success", "全部代理提供者更新成功");
|
||||
await refreshProxy();
|
||||
showNotice("success", t("All providers updated successfully"));
|
||||
} catch (err: any) {
|
||||
showNotice("error", `更新失败: ${err?.message || err.toString()}`);
|
||||
showNotice(
|
||||
"error",
|
||||
t("Failed to update providers: {{message}}", {
|
||||
message: err?.message || err.toString(),
|
||||
}),
|
||||
);
|
||||
} finally {
|
||||
// 清除所有更新状态
|
||||
setUpdating({});
|
||||
}
|
||||
});
|
||||
|
||||
const handleClose = () => {
|
||||
setOpen(false);
|
||||
};
|
||||
const handleClose = () => setOpen(false);
|
||||
|
||||
if (!hasProviders) return null;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button
|
||||
variant="outlined"
|
||||
size="small"
|
||||
startIcon={<StorageOutlined />}
|
||||
onClick={() => setOpen(true)}
|
||||
sx={{ mr: 1 }}
|
||||
>
|
||||
{t("Proxy Provider")}
|
||||
</Button>
|
||||
<Box sx={{ display: "flex", alignItems: "center", gap: 1, mr: 1 }}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
size="small"
|
||||
startIcon={<StorageOutlined />}
|
||||
onClick={() => setOpen(true)}
|
||||
disabled={isHydrating}
|
||||
title={
|
||||
isHydrating ? t("Proxy data is syncing, please wait") : undefined
|
||||
}
|
||||
>
|
||||
{t("Proxy Provider")}
|
||||
</Button>
|
||||
{hydrationChip}
|
||||
</Box>
|
||||
|
||||
<Dialog open={open} onClose={handleClose} maxWidth="sm" fullWidth>
|
||||
<DialogTitle>
|
||||
<Box
|
||||
display="flex"
|
||||
justifyContent="space-between"
|
||||
alignItems="center"
|
||||
sx={{
|
||||
display: "flex",
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
<Typography variant="h6">{t("Proxy Provider")}</Typography>
|
||||
<Box>
|
||||
<Button
|
||||
variant="contained"
|
||||
size="small"
|
||||
onClick={updateAllProviders}
|
||||
>
|
||||
{t("Update All")}
|
||||
</Button>
|
||||
</Box>
|
||||
<Button
|
||||
variant="contained"
|
||||
size="small"
|
||||
onClick={updateAllProviders}
|
||||
disabled={isHydrating}
|
||||
title={
|
||||
isHydrating
|
||||
? t("Proxy data is syncing, please wait")
|
||||
: undefined
|
||||
}
|
||||
>
|
||||
{t("Update All")}
|
||||
</Button>
|
||||
</Box>
|
||||
</DialogTitle>
|
||||
|
||||
@@ -166,54 +217,63 @@ export const ProviderButton = () => {
|
||||
{Object.entries(proxyProviders || {})
|
||||
.sort()
|
||||
.map(([key, item]) => {
|
||||
const provider = item;
|
||||
const time = dayjs(provider.updatedAt);
|
||||
if (!item) return null;
|
||||
|
||||
const time = dayjs(item.updatedAt);
|
||||
const isUpdating = updating[key];
|
||||
|
||||
// 订阅信息
|
||||
const sub = provider.subscriptionInfo;
|
||||
const hasSubInfo = !!sub;
|
||||
const upload = sub?.Upload || 0;
|
||||
const download = sub?.Download || 0;
|
||||
const total = sub?.Total || 0;
|
||||
const expire = sub?.Expire || 0;
|
||||
|
||||
// 流量使用进度
|
||||
const sub = item.subscriptionInfo;
|
||||
const hasSubInfo = Boolean(sub);
|
||||
const upload = sub?.Upload ?? 0;
|
||||
const download = sub?.Download ?? 0;
|
||||
const total = sub?.Total ?? 0;
|
||||
const expire = sub?.Expire ?? 0;
|
||||
const progress =
|
||||
total > 0
|
||||
? Math.min(
|
||||
Math.round(((download + upload) * 100) / total) + 1,
|
||||
100,
|
||||
Math.max(0, ((upload + download) / total) * 100),
|
||||
)
|
||||
: 0;
|
||||
|
||||
return (
|
||||
<ListItem
|
||||
key={key}
|
||||
sx={[
|
||||
{
|
||||
p: 0,
|
||||
mb: "8px",
|
||||
borderRadius: 2,
|
||||
overflow: "hidden",
|
||||
transition: "all 0.2s",
|
||||
},
|
||||
({ palette: { mode, primary } }) => {
|
||||
const bgcolor =
|
||||
mode === "light" ? "#ffffff" : "#24252f";
|
||||
const hoverColor =
|
||||
mode === "light"
|
||||
? alpha(primary.main, 0.1)
|
||||
: alpha(primary.main, 0.2);
|
||||
|
||||
return {
|
||||
backgroundColor: bgcolor,
|
||||
"&:hover": {
|
||||
backgroundColor: hoverColor,
|
||||
},
|
||||
};
|
||||
},
|
||||
]}
|
||||
secondaryAction={
|
||||
<Box
|
||||
sx={{
|
||||
width: 40,
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => updateProvider(key)}
|
||||
disabled={isUpdating || isHydrating}
|
||||
sx={{
|
||||
animation: isUpdating
|
||||
? "spin 1s linear infinite"
|
||||
: "none",
|
||||
"@keyframes spin": {
|
||||
"0%": { transform: "rotate(0deg)" },
|
||||
"100%": { transform: "rotate(360deg)" },
|
||||
},
|
||||
}}
|
||||
title={t("Update Provider") as string}
|
||||
>
|
||||
<RefreshRounded />
|
||||
</IconButton>
|
||||
</Box>
|
||||
}
|
||||
sx={{
|
||||
mb: 1,
|
||||
borderRadius: 1,
|
||||
border: "1px solid",
|
||||
borderColor: alpha("#ccc", 0.4),
|
||||
backgroundColor: alpha("#fff", 0.02),
|
||||
}}
|
||||
>
|
||||
<ListItemText
|
||||
sx={{ px: 2, py: 1 }}
|
||||
@@ -223,6 +283,7 @@ export const ProviderButton = () => {
|
||||
display: "flex",
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
gap: 1,
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
@@ -232,12 +293,12 @@ export const ProviderButton = () => {
|
||||
title={key}
|
||||
sx={{ display: "flex", alignItems: "center" }}
|
||||
>
|
||||
<span style={{ marginRight: "8px" }}>{key}</span>
|
||||
<span style={{ marginRight: 8 }}>{key}</span>
|
||||
<TypeBox component="span">
|
||||
{provider.proxies.length}
|
||||
{item.proxies.length}
|
||||
</TypeBox>
|
||||
<TypeBox component="span">
|
||||
{provider.vehicleType}
|
||||
{item.vehicleType}
|
||||
</TypeBox>
|
||||
</Typography>
|
||||
|
||||
@@ -252,72 +313,39 @@ export const ProviderButton = () => {
|
||||
</Box>
|
||||
}
|
||||
secondary={
|
||||
<>
|
||||
{/* 订阅信息 */}
|
||||
{hasSubInfo && (
|
||||
<>
|
||||
<Box
|
||||
sx={{
|
||||
mb: 1,
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
}}
|
||||
>
|
||||
<span title={t("Used / Total") as string}>
|
||||
{parseTraffic(upload + download)} /{" "}
|
||||
{parseTraffic(total)}
|
||||
</span>
|
||||
<span title={t("Expire Time") as string}>
|
||||
{parseExpire(expire)}
|
||||
</span>
|
||||
</Box>
|
||||
hasSubInfo ? (
|
||||
<>
|
||||
<Box
|
||||
sx={{
|
||||
mb: 1,
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
}}
|
||||
>
|
||||
<span title={t("Used / Total") as string}>
|
||||
{parseTraffic(upload + download)} /{" "}
|
||||
{parseTraffic(total)}
|
||||
</span>
|
||||
<span title={t("Expire Time") as string}>
|
||||
{parseExpire(expire)}
|
||||
</span>
|
||||
</Box>
|
||||
|
||||
{/* 进度条 */}
|
||||
<LinearProgress
|
||||
variant="determinate"
|
||||
value={progress}
|
||||
sx={{
|
||||
height: 6,
|
||||
borderRadius: 3,
|
||||
opacity: total > 0 ? 1 : 0,
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
<LinearProgress
|
||||
variant="determinate"
|
||||
value={progress}
|
||||
sx={{
|
||||
height: 6,
|
||||
borderRadius: 3,
|
||||
opacity: total > 0 ? 1 : 0,
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
) : null
|
||||
}
|
||||
/>
|
||||
<Divider orientation="vertical" flexItem />
|
||||
<Box
|
||||
sx={{
|
||||
width: 40,
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => {
|
||||
updateProvider(key);
|
||||
}}
|
||||
disabled={isUpdating}
|
||||
sx={{
|
||||
animation: isUpdating
|
||||
? "spin 1s linear infinite"
|
||||
: "none",
|
||||
"@keyframes spin": {
|
||||
"0%": { transform: "rotate(0deg)" },
|
||||
"100%": { transform: "rotate(360deg)" },
|
||||
},
|
||||
}}
|
||||
title={t("Update Provider") as string}
|
||||
>
|
||||
<RefreshRounded />
|
||||
</IconButton>
|
||||
</Box>
|
||||
</ListItem>
|
||||
);
|
||||
})}
|
||||
|
||||
@@ -61,10 +61,17 @@ export const ProxyGroups = (props: Props) => {
|
||||
}>({ open: false, message: "" });
|
||||
|
||||
const { verge } = useVerge();
|
||||
const { proxies: proxiesData } = useAppData();
|
||||
const {
|
||||
proxies: proxiesData,
|
||||
proxyHydration,
|
||||
proxyTargetProfileId,
|
||||
proxyDisplayProfileId,
|
||||
isProxyRefreshPending,
|
||||
} = useAppData();
|
||||
const groups = proxiesData?.groups;
|
||||
const availableGroups = useMemo(() => groups ?? [], [groups]);
|
||||
|
||||
const showHydrationOverlay = isProxyRefreshPending;
|
||||
const pendingProfileSwitch = proxyTargetProfileId !== proxyDisplayProfileId;
|
||||
const defaultRuleGroup = useMemo(() => {
|
||||
if (isChainMode && mode === "rule" && availableGroups.length > 0) {
|
||||
return availableGroups[0].name;
|
||||
@@ -76,6 +83,35 @@ export const ProxyGroups = (props: Props) => {
|
||||
() => selectedGroup ?? defaultRuleGroup,
|
||||
[selectedGroup, defaultRuleGroup],
|
||||
);
|
||||
const hydrationChip = useMemo(() => {
|
||||
if (proxyHydration === "live") return null;
|
||||
|
||||
const label =
|
||||
proxyHydration === "snapshot" ? t("Snapshot data") : t("Syncing...");
|
||||
|
||||
return (
|
||||
<Chip
|
||||
size="small"
|
||||
color={proxyHydration === "snapshot" ? "warning" : "info"}
|
||||
label={label}
|
||||
sx={{ fontWeight: 500, height: 22 }}
|
||||
/>
|
||||
);
|
||||
}, [proxyHydration, t]);
|
||||
|
||||
const overlayMessage = useMemo(() => {
|
||||
if (!showHydrationOverlay) return null;
|
||||
|
||||
if (pendingProfileSwitch) {
|
||||
return t("Loading proxy data for the selected profile...");
|
||||
}
|
||||
|
||||
if (proxyHydration === "snapshot") {
|
||||
return t("Preparing proxy snapshot...");
|
||||
}
|
||||
|
||||
return t("Syncing proxy data...");
|
||||
}, [showHydrationOverlay, pendingProfileSwitch, proxyHydration, t]);
|
||||
|
||||
const { renderList, onProxies, onHeadState } = useRenderList(
|
||||
mode,
|
||||
@@ -93,7 +129,7 @@ export const ProxyGroups = (props: Props) => {
|
||||
[renderList],
|
||||
);
|
||||
|
||||
// 统代理选择
|
||||
// 系统代理选择
|
||||
const { handleProxyGroupChange } = useProxySelection({
|
||||
onSuccess: () => {
|
||||
onProxies();
|
||||
@@ -306,12 +342,7 @@ export const ProxyGroups = (props: Props) => {
|
||||
try {
|
||||
await Promise.race([
|
||||
delayManager.checkListDelay(names, groupName, timeout),
|
||||
delayGroup(groupName, url, timeout).then((result) => {
|
||||
console.log(
|
||||
`[ProxyGroups] getGroupProxyDelays返回结果数量:`,
|
||||
Object.keys(result || {}).length,
|
||||
);
|
||||
}), // 查询group delays 将清除fixed(不关注调用结果)
|
||||
delayGroup(groupName, url, timeout),
|
||||
]);
|
||||
console.log(`[ProxyGroups] 延迟测试完成，组: ${groupName}`);
|
||||
} catch (error) {
|
||||
@@ -376,6 +407,11 @@ export const ProxyGroups = (props: Props) => {
|
||||
}
|
||||
|
||||
if (isChainMode) {
|
||||
const chainVirtuosoHeight =
|
||||
mode === "rule" && proxyGroupNames.length > 0
|
||||
? "calc(100% - 80px)"
|
||||
: "calc(100% - 14px)";
|
||||
|
||||
// 获取所有代理组
|
||||
const proxyGroups = proxiesData?.groups || [];
|
||||
|
||||
@@ -454,10 +490,7 @@ export const ProxyGroups = (props: Props) => {
|
||||
<Virtuoso
|
||||
ref={virtuosoRef}
|
||||
style={{
|
||||
height:
|
||||
mode === "rule" && proxyGroups.length > 0
|
||||
? "calc(100% - 80px)" // 只有标题的高度
|
||||
: "calc(100% - 14px)",
|
||||
height: chainVirtuosoHeight,
|
||||
}}
|
||||
totalCount={renderList.length}
|
||||
increaseViewportBy={{ top: 200, bottom: 200 }}
|
||||
@@ -548,7 +581,9 @@ export const ProxyGroups = (props: Props) => {
|
||||
{group.name}
|
||||
</Typography>
|
||||
<Typography variant="caption" color="text.secondary">
|
||||
{group.type} · {group.all.length} 节点
|
||||
{`${t("Group Type")}: ${group.type} · ${t("Proxy Count")}: ${
|
||||
Array.isArray(group.all) ? group.all.length : 0
|
||||
}`}
|
||||
</Typography>
|
||||
</Box>
|
||||
</MenuItem>
|
||||
@@ -556,7 +591,7 @@ export const ProxyGroups = (props: Props) => {
|
||||
{availableGroups.length === 0 && (
|
||||
<MenuItem disabled>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
暂无可用代理组
|
||||
{t("Empty")}
|
||||
</Typography>
|
||||
</MenuItem>
|
||||
)}
|
||||
@@ -567,9 +602,29 @@ export const ProxyGroups = (props: Props) => {
|
||||
|
||||
return (
|
||||
<div
|
||||
style={{ position: "relative", height: "100%", willChange: "transform" }}
|
||||
style={{
|
||||
position: "relative",
|
||||
height: "100%",
|
||||
willChange: "transform",
|
||||
opacity: showHydrationOverlay ? 0.45 : 1,
|
||||
transition: "opacity 120ms ease",
|
||||
}}
|
||||
>
|
||||
{/* 代理组导航栏 */}
|
||||
{hydrationChip && (
|
||||
<Box
|
||||
sx={{
|
||||
position: "absolute",
|
||||
top: 8,
|
||||
right: 16,
|
||||
zIndex: 2,
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
gap: 8,
|
||||
}}
|
||||
>
|
||||
{hydrationChip}
|
||||
</Box>
|
||||
)}
|
||||
{mode === "rule" && (
|
||||
<ProxyGroupNavigator
|
||||
proxyGroupNames={proxyGroupNames}
|
||||
@@ -608,6 +663,39 @@ export const ProxyGroups = (props: Props) => {
|
||||
)}
|
||||
/>
|
||||
<ScrollTopButton show={showScrollTop} onClick={scrollToTop} />
|
||||
{showHydrationOverlay && overlayMessage && (
|
||||
<Box
|
||||
sx={{
|
||||
position: "absolute",
|
||||
inset: 0,
|
||||
zIndex: 3,
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
pointerEvents: "auto",
|
||||
cursor: "wait",
|
||||
backgroundColor: "rgba(8, 8, 8, 0.12)",
|
||||
}}
|
||||
>
|
||||
<Box
|
||||
sx={{
|
||||
px: 2.5,
|
||||
py: 1.5,
|
||||
borderRadius: 1,
|
||||
bgcolor: "background.paper",
|
||||
boxShadow: 3,
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="text.secondary"
|
||||
sx={{ fontWeight: 500 }}
|
||||
>
|
||||
{overlayMessage}
|
||||
</Typography>
|
||||
</Box>
|
||||
</Box>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -14,50 +14,13 @@ import {
|
||||
} from "./use-head-state";
|
||||
import { useWindowWidth } from "./use-window-width";
|
||||
|
||||
// 定义代理项接口
|
||||
interface IProxyItem {
|
||||
name: string;
|
||||
type: string;
|
||||
udp: boolean;
|
||||
xudp: boolean;
|
||||
tfo: boolean;
|
||||
mptcp: boolean;
|
||||
smux: boolean;
|
||||
history: {
|
||||
time: string;
|
||||
delay: number;
|
||||
}[];
|
||||
provider?: string;
|
||||
testUrl?: string;
|
||||
[key: string]: any; // 添加索引签名以适应其他可能的属性
|
||||
}
|
||||
|
||||
// 代理组类型
|
||||
type ProxyGroup = {
|
||||
name: string;
|
||||
type: string;
|
||||
udp: boolean;
|
||||
xudp: boolean;
|
||||
tfo: boolean;
|
||||
mptcp: boolean;
|
||||
smux: boolean;
|
||||
history: {
|
||||
time: string;
|
||||
delay: number;
|
||||
}[];
|
||||
now: string;
|
||||
all: IProxyItem[];
|
||||
hidden?: boolean;
|
||||
icon?: string;
|
||||
testUrl?: string;
|
||||
provider?: string;
|
||||
};
|
||||
type RenderGroup = IProxyGroupItem;
|
||||
|
||||
export interface IRenderItem {
|
||||
// 组 | head | item | empty | item col
|
||||
type: 0 | 1 | 2 | 3 | 4;
|
||||
key: string;
|
||||
group: ProxyGroup;
|
||||
group: RenderGroup;
|
||||
proxy?: IProxyItem;
|
||||
col?: number;
|
||||
proxyCol?: IProxyItem[];
|
||||
@@ -99,7 +62,7 @@ export const useRenderList = (
|
||||
selectedGroup?: string | null,
|
||||
) => {
|
||||
// 使用全局数据提供者
|
||||
const { proxies: proxiesData, refreshProxy } = useAppData();
|
||||
const { proxies: proxiesData, proxyHydration, refreshProxy } = useAppData();
|
||||
const { verge } = useVerge();
|
||||
const { width } = useWindowWidth();
|
||||
const [headStates, setHeadState] = useHeadStateNew();
|
||||
@@ -123,17 +86,29 @@ export const useRenderList = (
|
||||
|
||||
// 确保代理数据加载
|
||||
useEffect(() => {
|
||||
if (!proxiesData) return;
|
||||
if (!proxiesData || proxyHydration !== "live") return;
|
||||
const { groups, proxies } = proxiesData;
|
||||
|
||||
if (
|
||||
(mode === "rule" && !groups.length) ||
|
||||
(mode === "global" && proxies.length < 2)
|
||||
) {
|
||||
const handle = setTimeout(() => refreshProxy(), 500);
|
||||
const handle = setTimeout(() => {
|
||||
void refreshProxy().catch(() => {});
|
||||
}, 500);
|
||||
return () => clearTimeout(handle);
|
||||
}
|
||||
}, [proxiesData, mode, refreshProxy]);
|
||||
}, [proxiesData, proxyHydration, mode, refreshProxy]);
|
||||
|
||||
useEffect(() => {
|
||||
if (proxyHydration !== "snapshot") return;
|
||||
|
||||
const handle = setTimeout(() => {
|
||||
void refreshProxy().catch(() => {});
|
||||
}, 1800);
|
||||
|
||||
return () => clearTimeout(handle);
|
||||
}, [proxyHydration, refreshProxy]);
|
||||
|
||||
// 链式代理模式节点自动计算延迟
|
||||
useEffect(() => {
|
||||
@@ -147,7 +122,7 @@ export const useRenderList = (
|
||||
// 设置组监听器，当有延迟更新时自动刷新
|
||||
const groupListener = () => {
|
||||
console.log("[ChainMode] 延迟更新，刷新UI");
|
||||
refreshProxy();
|
||||
void refreshProxy().catch(() => {});
|
||||
};
|
||||
|
||||
delayManager.setGroupListener("chain-mode", groupListener);
|
||||
@@ -188,9 +163,12 @@ export const useRenderList = (
|
||||
// 链式代理模式下，显示代理组和其节点
|
||||
if (isChainMode && runtimeConfig && mode === "rule") {
|
||||
// 使用正常的规则模式代理组
|
||||
const allGroups = proxiesData.groups.length
|
||||
? proxiesData.groups
|
||||
: [proxiesData.global!];
|
||||
const chainGroups = proxiesData.groups ?? [];
|
||||
const allGroups = chainGroups.length
|
||||
? chainGroups
|
||||
: proxiesData.global
|
||||
? [proxiesData.global]
|
||||
: [];
|
||||
|
||||
// 如果选择了特定代理组，只显示该组的节点
|
||||
if (selectedGroup) {
|
||||
@@ -282,7 +260,7 @@ export const useRenderList = (
|
||||
});
|
||||
|
||||
// 创建一个虚拟的组来容纳所有节点
|
||||
const virtualGroup: ProxyGroup = {
|
||||
const virtualGroup: RenderGroup = {
|
||||
name: "All Proxies",
|
||||
type: "Selector",
|
||||
udp: false,
|
||||
@@ -340,7 +318,7 @@ export const useRenderList = (
|
||||
});
|
||||
|
||||
// 创建一个虚拟的组来容纳所有节点
|
||||
const virtualGroup: ProxyGroup = {
|
||||
const virtualGroup: RenderGroup = {
|
||||
name: "All Proxies",
|
||||
type: "Selector",
|
||||
udp: false,
|
||||
@@ -380,12 +358,15 @@ export const useRenderList = (
|
||||
|
||||
// 正常模式的渲染逻辑
|
||||
const useRule = mode === "rule" || mode === "script";
|
||||
const renderGroups =
|
||||
useRule && proxiesData.groups.length
|
||||
? proxiesData.groups
|
||||
: [proxiesData.global!];
|
||||
const renderGroups = (() => {
|
||||
const groups = proxiesData.groups ?? [];
|
||||
if (useRule && groups.length) {
|
||||
return groups;
|
||||
}
|
||||
return proxiesData.global ? [proxiesData.global] : groups;
|
||||
})();
|
||||
|
||||
const retList = renderGroups.flatMap((group: ProxyGroup) => {
|
||||
const retList = renderGroups.flatMap((group: RenderGroup) => {
|
||||
const headState = headStates[group.name] || DEFAULT_STATE;
|
||||
const ret: IRenderItem[] = [
|
||||
{
|
||||
|
||||
@@ -2,12 +2,6 @@ import { useMemo } from "react";
|
||||
|
||||
import { useAppData } from "@/providers/app-data-context";
|
||||
|
||||
// 定义代理组类型
|
||||
interface ProxyGroup {
|
||||
name: string;
|
||||
now: string;
|
||||
}
|
||||
|
||||
// 获取当前代理节点信息的自定义Hook
|
||||
export const useCurrentProxy = () => {
|
||||
// 从AppDataProvider获取数据
|
||||
@@ -37,15 +31,15 @@ export const useCurrentProxy = () => {
|
||||
"自动选择",
|
||||
];
|
||||
const primaryGroup =
|
||||
groups.find((group: ProxyGroup) =>
|
||||
groups.find((group) =>
|
||||
primaryKeywords.some((keyword) =>
|
||||
group.name.toLowerCase().includes(keyword.toLowerCase()),
|
||||
),
|
||||
) || groups.filter((g: ProxyGroup) => g.name !== "GLOBAL")[0];
|
||||
) || groups.find((group) => group.name !== "GLOBAL");
|
||||
|
||||
if (primaryGroup) {
|
||||
primaryGroupName = primaryGroup.name;
|
||||
currentName = primaryGroup.now;
|
||||
currentName = primaryGroup.now ?? currentName;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,33 +5,54 @@ import {
|
||||
getProfiles,
|
||||
patchProfile,
|
||||
patchProfilesConfig,
|
||||
calcuProxies,
|
||||
} from "@/services/cmds";
|
||||
import { calcuProxies } from "@/services/cmds";
|
||||
import {
|
||||
useProfileStore,
|
||||
selectEffectiveProfiles,
|
||||
selectIsHydrating,
|
||||
selectLastResult,
|
||||
} from "@/stores/profile-store";
|
||||
|
||||
export const useProfiles = () => {
|
||||
const profilesFromStore = useProfileStore(selectEffectiveProfiles);
|
||||
const storeHydrating = useProfileStore(selectIsHydrating);
|
||||
const lastResult = useProfileStore(selectLastResult);
|
||||
const commitProfileSnapshot = useProfileStore(
|
||||
(state) => state.commitHydrated,
|
||||
);
|
||||
|
||||
const {
|
||||
data: profiles,
|
||||
data: swrProfiles,
|
||||
mutate: mutateProfiles,
|
||||
error,
|
||||
isValidating,
|
||||
} = useSWR("getProfiles", getProfiles, {
|
||||
revalidateOnFocus: false,
|
||||
revalidateOnReconnect: false,
|
||||
dedupingInterval: 500, // 减少去重时间，提高响应性
|
||||
dedupingInterval: 500,
|
||||
errorRetryCount: 3,
|
||||
errorRetryInterval: 1000,
|
||||
refreshInterval: 0, // 完全由手动控制
|
||||
onError: (error) => {
|
||||
console.error("[useProfiles] SWR错误:", error);
|
||||
refreshInterval: 0,
|
||||
onError: (err) => {
|
||||
console.error("[useProfiles] SWR错误:", err);
|
||||
},
|
||||
onSuccess: (data) => {
|
||||
commitProfileSnapshot(data);
|
||||
console.log(
|
||||
"[useProfiles] 配置数据更新成功，配置数量:",
|
||||
"[useProfiles] 配置数据更新成功，配置数量",
|
||||
data?.items?.length || 0,
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
const rawProfiles = profilesFromStore ?? swrProfiles;
|
||||
const profiles = (rawProfiles ?? {
|
||||
current: null,
|
||||
items: [],
|
||||
}) as IProfilesConfig;
|
||||
const hasProfiles = rawProfiles != null;
|
||||
|
||||
const patchProfiles = async (
|
||||
value: Partial<IProfilesConfig>,
|
||||
signal?: AbortSignal,
|
||||
@@ -49,32 +70,30 @@ export const useProfiles = () => {
|
||||
await mutateProfiles();
|
||||
|
||||
return success;
|
||||
} catch (error) {
|
||||
if (error instanceof DOMException && error.name === "AbortError") {
|
||||
throw error;
|
||||
} catch (err) {
|
||||
if (err instanceof DOMException && err.name === "AbortError") {
|
||||
throw err;
|
||||
}
|
||||
|
||||
await mutateProfiles();
|
||||
throw error;
|
||||
throw err;
|
||||
}
|
||||
};
|
||||
|
||||
const patchCurrent = async (value: Partial<IProfileItem>) => {
|
||||
if (profiles?.current) {
|
||||
await patchProfile(profiles.current, value);
|
||||
mutateProfiles();
|
||||
if (!hasProfiles || !profiles.current) {
|
||||
return;
|
||||
}
|
||||
await patchProfile(profiles.current, value);
|
||||
mutateProfiles();
|
||||
};
|
||||
|
||||
// 根据selected的节点选择
|
||||
const activateSelected = async () => {
|
||||
try {
|
||||
console.log("[ActivateSelected] 开始处理代理选择");
|
||||
|
||||
const [proxiesData, profileData] = await Promise.all([
|
||||
calcuProxies(),
|
||||
getProfiles(),
|
||||
]);
|
||||
const proxiesData = await calcuProxies();
|
||||
const profileData = hasProfiles ? profiles : null;
|
||||
|
||||
if (!profileData || !proxiesData) {
|
||||
console.log("[ActivateSelected] 代理或配置数据不可用，跳过处理");
|
||||
@@ -90,7 +109,6 @@ export const useProfiles = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查是否有saved的代理选择
|
||||
const { selected = [] } = current;
|
||||
if (selected.length === 0) {
|
||||
console.log("[ActivateSelected] 当前profile无保存的代理选择，跳过");
|
||||
@@ -98,7 +116,7 @@ export const useProfiles = () => {
|
||||
}
|
||||
|
||||
console.log(
|
||||
`[ActivateSelected] 当前profile有 ${selected.length} 个代理选择配置`,
|
||||
`[ActivateSelected] 当前profile有${selected.length} 个代理选择配置`,
|
||||
);
|
||||
|
||||
const selectedMap = Object.fromEntries(
|
||||
@@ -115,7 +133,6 @@ export const useProfiles = () => {
|
||||
"LoadBalance",
|
||||
]);
|
||||
|
||||
// 处理所有代理组
|
||||
[global, ...groups].forEach((group) => {
|
||||
if (!group) {
|
||||
return;
|
||||
@@ -150,7 +167,7 @@ export const useProfiles = () => {
|
||||
|
||||
if (!existsInGroup) {
|
||||
console.warn(
|
||||
`[ActivateSelected] 保存的代理 ${savedProxy} 不存在于代理组 ${name}`,
|
||||
`[ActivateSelected] 保存的代理${savedProxy} 不存在于代理组${name}`,
|
||||
);
|
||||
hasChange = true;
|
||||
newSelected.push({ name, now: now ?? savedProxy });
|
||||
@@ -173,7 +190,7 @@ export const useProfiles = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`[ActivateSelected] 完成代理切换，保存新的选择配置`);
|
||||
console.log("[ActivateSelected] 完成代理切换，保存新的选择配置");
|
||||
|
||||
try {
|
||||
await patchProfile(profileData.current!, { selected: newSelected });
|
||||
@@ -195,14 +212,18 @@ export const useProfiles = () => {
|
||||
|
||||
return {
|
||||
profiles,
|
||||
current: profiles?.items?.find((p) => p && p.uid === profiles.current),
|
||||
hasProfiles,
|
||||
current: hasProfiles
|
||||
? (profiles.items?.find((p) => p && p.uid === profiles.current) ?? null)
|
||||
: null,
|
||||
activateSelected,
|
||||
patchProfiles,
|
||||
patchCurrent,
|
||||
mutateProfiles,
|
||||
// 新增故障检测状态
|
||||
isLoading: isValidating,
|
||||
isLoading: isValidating || storeHydrating,
|
||||
isHydrating: storeHydrating,
|
||||
lastResult,
|
||||
error,
|
||||
isStale: !profiles && !error && !isValidating, // 检测是否处于异常状态
|
||||
isStale: !hasProfiles && !error && !isValidating,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import { listen } from "@tauri-apps/api/event";
|
||||
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import { useEffect } from "react";
|
||||
import { mutate } from "swr";
|
||||
|
||||
import { useListen } from "@/hooks/use-listen";
|
||||
import { getAxios } from "@/services/api";
|
||||
|
||||
import { refreshClashData, refreshVergeData } from "@/services/refresh";
|
||||
export const useLayoutEvents = (
|
||||
handleNotice: (payload: [string, string]) => void,
|
||||
) => {
|
||||
@@ -37,32 +35,32 @@ export const useLayoutEvents = (
|
||||
.catch((error) => console.error("[事件监听] 注册失败", error));
|
||||
};
|
||||
|
||||
register(
|
||||
addListener("verge://notice-message", ({ payload }) =>
|
||||
handleNotice(payload as [string, string]),
|
||||
),
|
||||
);
|
||||
|
||||
register(
|
||||
addListener("verge://refresh-clash-config", async () => {
|
||||
await getAxios(true);
|
||||
mutate("getProxies");
|
||||
mutate("getVersion");
|
||||
mutate("getClashConfig");
|
||||
mutate("getProxyProviders");
|
||||
try {
|
||||
await refreshClashData();
|
||||
} catch (error) {
|
||||
console.error("[事件监听] 刷新 Clash 配置失败", error);
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
register(
|
||||
addListener("verge://refresh-verge-config", () => {
|
||||
mutate("getVergeConfig");
|
||||
mutate("getSystemProxy");
|
||||
mutate("getAutotemProxy");
|
||||
mutate("getRunningMode");
|
||||
mutate("isServiceAvailable");
|
||||
try {
|
||||
refreshVergeData();
|
||||
} catch (error) {
|
||||
console.error("[事件监听] 刷新 Verge 配置失败", error);
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
register(
|
||||
addListener("verge://notice-message", ({ payload }) =>
|
||||
handleNotice(payload as [string, string]),
|
||||
),
|
||||
);
|
||||
|
||||
const appWindow = getCurrentWebviewWindow();
|
||||
register(
|
||||
(async () => {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,8 +6,15 @@ import {
|
||||
RuleProvider,
|
||||
} from "tauri-plugin-mihomo-api";
|
||||
|
||||
import { ProxiesView, type ProfileSwitchStatus } from "@/services/cmds";
|
||||
|
||||
export interface AppDataContextType {
|
||||
proxies: any;
|
||||
proxies: ProxiesView | null;
|
||||
proxyHydration: "none" | "snapshot" | "live";
|
||||
proxyTargetProfileId: string | null;
|
||||
proxyDisplayProfileId: string | null;
|
||||
isProxyRefreshPending: boolean;
|
||||
switchStatus: ProfileSwitchStatus | null;
|
||||
clashConfig: BaseConfig;
|
||||
rules: Rule[];
|
||||
sysproxy: any;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { listen } from "@tauri-apps/api/event";
|
||||
import React, { useCallback, useEffect, useMemo } from "react";
|
||||
import useSWR from "swr";
|
||||
import React, { useCallback, useEffect, useMemo, useRef } from "react";
|
||||
import useSWR, { mutate as globalMutate } from "swr";
|
||||
import {
|
||||
getBaseConfig,
|
||||
getRuleProviders,
|
||||
@@ -9,31 +9,53 @@ import {
|
||||
|
||||
import { useVerge } from "@/hooks/use-verge";
|
||||
import {
|
||||
calcuProxies,
|
||||
calcuProxyProviders,
|
||||
getAppUptime,
|
||||
getProfileSwitchStatus,
|
||||
getProfileSwitchEvents,
|
||||
getProfiles as fetchProfilesConfig,
|
||||
getRunningMode,
|
||||
readProfileFile,
|
||||
getSystemProxy,
|
||||
type ProxiesView,
|
||||
type ProfileSwitchStatus,
|
||||
type SwitchResultStatus,
|
||||
} from "@/services/cmds";
|
||||
import { SWR_DEFAULTS, SWR_REALTIME, SWR_SLOW_POLL } from "@/services/config";
|
||||
import { SWR_DEFAULTS, SWR_SLOW_POLL } from "@/services/config";
|
||||
import { useProfileStore } from "@/stores/profile-store";
|
||||
import {
|
||||
applyLiveProxyPayload,
|
||||
fetchLiveProxies,
|
||||
type ProxiesUpdatedPayload,
|
||||
useProxyStore,
|
||||
} from "@/stores/proxy-store";
|
||||
import { createProxySnapshotFromProfile } from "@/utils/proxy-snapshot";
|
||||
|
||||
import { AppDataContext, AppDataContextType } from "./app-data-context";
|
||||
|
||||
// 全局数据提供者组件
|
||||
// Global app data provider
|
||||
export const AppDataProvider = ({
|
||||
children,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
}) => {
|
||||
const { verge } = useVerge();
|
||||
|
||||
const { data: proxiesData, mutate: refreshProxy } = useSWR(
|
||||
"getProxies",
|
||||
calcuProxies,
|
||||
{
|
||||
...SWR_REALTIME,
|
||||
onError: (err) => console.warn("[DataProvider] Proxy fetch failed:", err),
|
||||
},
|
||||
const applyProfileSwitchResult = useProfileStore(
|
||||
(state) => state.applySwitchResult,
|
||||
);
|
||||
const commitProfileSnapshot = useProfileStore(
|
||||
(state) => state.commitHydrated,
|
||||
);
|
||||
const setSwitchEventSeq = useProfileStore((state) => state.setLastEventSeq);
|
||||
const proxyView = useProxyStore((state) => state.data);
|
||||
const proxyHydration = useProxyStore((state) => state.hydration);
|
||||
const proxyProfileId = useProxyStore((state) => state.lastProfileId);
|
||||
const pendingProxyProfileId = useProxyStore(
|
||||
(state) => state.pendingProfileId,
|
||||
);
|
||||
const setProxySnapshot = useProxyStore((state) => state.setSnapshot);
|
||||
const clearPendingProxyProfile = useProxyStore(
|
||||
(state) => state.clearPendingProfile,
|
||||
);
|
||||
|
||||
const { data: clashConfig, mutate: refreshClashConfig } = useSWR(
|
||||
@@ -60,25 +82,259 @@ export const AppDataProvider = ({
|
||||
SWR_DEFAULTS,
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
let lastProfileId: string | null = null;
|
||||
let lastUpdateTime = 0;
|
||||
const refreshThrottle = 800;
|
||||
const { data: switchStatus, mutate: mutateSwitchStatus } =
|
||||
useSWR<ProfileSwitchStatus>(
|
||||
"getProfileSwitchStatus",
|
||||
getProfileSwitchStatus,
|
||||
{
|
||||
refreshInterval: (status) =>
|
||||
status && (status.isSwitching || (status.queue?.length ?? 0) > 0)
|
||||
? 400
|
||||
: 4000,
|
||||
dedupingInterval: 200,
|
||||
},
|
||||
);
|
||||
|
||||
let isUnmounted = false;
|
||||
const scheduledTimeouts = new Set<number>();
|
||||
const isUnmountedRef = useRef(false);
|
||||
// Keep track of pending timers so we can cancel them on unmount and avoid stray updates.
|
||||
const scheduledTimeoutsRef = useRef<Set<number>>(new Set());
|
||||
// Shared metadata to dedupe switch events coming from both polling and subscriptions.
|
||||
const switchMetaRef = useRef<{
|
||||
pendingProfileId: string | null;
|
||||
lastResultTaskId: number | null;
|
||||
}>({
|
||||
pendingProfileId: null,
|
||||
lastResultTaskId: null,
|
||||
});
|
||||
const switchEventSeqRef = useRef(0);
|
||||
const profileChangeMetaRef = useRef<{
|
||||
lastProfileId: string | null;
|
||||
lastEventTs: number;
|
||||
}>({
|
||||
lastProfileId: null,
|
||||
lastEventTs: 0,
|
||||
});
|
||||
const lastClashRefreshAtRef = useRef(0);
|
||||
const PROFILE_EVENT_DEDUP_MS = 400;
|
||||
const CLASH_REFRESH_DEDUP_MS = 300;
|
||||
|
||||
// Thin wrapper around setTimeout that no-ops once the provider unmounts.
|
||||
const scheduleTimeout = useCallback(
|
||||
(callback: () => void | Promise<void>, delay: number) => {
|
||||
if (isUnmountedRef.current) return -1;
|
||||
|
||||
const timeoutId = window.setTimeout(() => {
|
||||
scheduledTimeoutsRef.current.delete(timeoutId);
|
||||
if (!isUnmountedRef.current) {
|
||||
void callback();
|
||||
}
|
||||
}, delay);
|
||||
|
||||
scheduledTimeoutsRef.current.add(timeoutId);
|
||||
return timeoutId;
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
const clearAllTimeouts = useCallback(() => {
|
||||
scheduledTimeoutsRef.current.forEach((timeoutId) =>
|
||||
clearTimeout(timeoutId),
|
||||
);
|
||||
scheduledTimeoutsRef.current.clear();
|
||||
}, []);
|
||||
|
||||
// Delay live proxy refreshes slightly so we don't hammer Mihomo while a switch is still applying.
|
||||
const queueProxyRefresh = useCallback(
|
||||
(reason: string, delay = 1500) => {
|
||||
scheduleTimeout(() => {
|
||||
fetchLiveProxies().catch((error) =>
|
||||
console.warn(
|
||||
`[DataProvider] Proxy refresh failed (${reason}, fallback):`,
|
||||
error,
|
||||
),
|
||||
);
|
||||
}, delay);
|
||||
},
|
||||
[scheduleTimeout],
|
||||
);
|
||||
// Prime the proxy store with the static selections from the profile YAML before live data arrives.
|
||||
const seedProxySnapshot = useCallback(
|
||||
async (profileId: string) => {
|
||||
if (!profileId) return;
|
||||
|
||||
try {
|
||||
const yamlContent = await readProfileFile(profileId);
|
||||
const snapshot = createProxySnapshotFromProfile(yamlContent);
|
||||
if (!snapshot) return;
|
||||
|
||||
setProxySnapshot(snapshot, profileId);
|
||||
} catch (error) {
|
||||
console.warn(
|
||||
"[DataProvider] Failed to seed proxy snapshot from profile:",
|
||||
error,
|
||||
);
|
||||
}
|
||||
},
|
||||
[setProxySnapshot],
|
||||
);
|
||||
|
||||
const handleSwitchResult = useCallback(
|
||||
(result: SwitchResultStatus) => {
|
||||
// Ignore duplicate notifications for the same switch execution.
|
||||
const meta = switchMetaRef.current;
|
||||
if (result.taskId === meta.lastResultTaskId) {
|
||||
return;
|
||||
}
|
||||
meta.lastResultTaskId = result.taskId;
|
||||
|
||||
// Optimistically update the SWR cache so the UI shows the new profile immediately.
|
||||
void globalMutate(
|
||||
"getProfiles",
|
||||
(current?: IProfilesConfig | null) => {
|
||||
if (!current || !result.success) {
|
||||
return current;
|
||||
}
|
||||
if (current.current === result.profileId) {
|
||||
return current;
|
||||
}
|
||||
return {
|
||||
...current,
|
||||
current: result.profileId,
|
||||
};
|
||||
},
|
||||
false,
|
||||
);
|
||||
|
||||
applyProfileSwitchResult(result);
|
||||
if (!result.success) {
|
||||
clearPendingProxyProfile();
|
||||
}
|
||||
|
||||
if (result.success && result.cancelled !== true) {
|
||||
// Once the backend settles, refresh all dependent data in the background.
|
||||
scheduleTimeout(() => {
|
||||
void Promise.allSettled([
|
||||
fetchProfilesConfig().then((data) => {
|
||||
commitProfileSnapshot(data);
|
||||
globalMutate("getProfiles", data, false);
|
||||
}),
|
||||
fetchLiveProxies(),
|
||||
refreshProxyProviders(),
|
||||
refreshRules(),
|
||||
refreshRuleProviders(),
|
||||
]).catch((error) => {
|
||||
console.warn(
|
||||
"[DataProvider] Background refresh after profile switch failed:",
|
||||
error,
|
||||
);
|
||||
});
|
||||
}, 100);
|
||||
}
|
||||
|
||||
void mutateSwitchStatus((current) => {
|
||||
if (!current) {
|
||||
return current;
|
||||
}
|
||||
const filteredQueue = current.queue.filter(
|
||||
(task) => task.taskId !== result.taskId,
|
||||
);
|
||||
const active =
|
||||
current.active && current.active.taskId === result.taskId
|
||||
? null
|
||||
: current.active;
|
||||
const isSwitching = filteredQueue.length > 0;
|
||||
return {
|
||||
...current,
|
||||
active,
|
||||
queue: filteredQueue,
|
||||
isSwitching,
|
||||
lastResult: result,
|
||||
};
|
||||
}, false);
|
||||
},
|
||||
[
|
||||
scheduleTimeout,
|
||||
refreshProxyProviders,
|
||||
refreshRules,
|
||||
refreshRuleProviders,
|
||||
mutateSwitchStatus,
|
||||
applyProfileSwitchResult,
|
||||
commitProfileSnapshot,
|
||||
clearPendingProxyProfile,
|
||||
],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
isUnmountedRef.current = false;
|
||||
return () => {
|
||||
isUnmountedRef.current = true;
|
||||
clearAllTimeouts();
|
||||
};
|
||||
}, [clearAllTimeouts]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!switchStatus) {
|
||||
return;
|
||||
}
|
||||
|
||||
const meta = switchMetaRef.current;
|
||||
const nextTarget =
|
||||
switchStatus.active?.profileId ??
|
||||
(switchStatus.queue.length > 0 ? switchStatus.queue[0].profileId : null);
|
||||
|
||||
if (nextTarget && nextTarget !== meta.pendingProfileId) {
|
||||
meta.pendingProfileId = nextTarget;
|
||||
void seedProxySnapshot(nextTarget);
|
||||
} else if (!nextTarget) {
|
||||
meta.pendingProfileId = null;
|
||||
}
|
||||
|
||||
const lastResult = switchStatus.lastResult ?? null;
|
||||
if (lastResult) {
|
||||
handleSwitchResult(lastResult);
|
||||
}
|
||||
}, [switchStatus, seedProxySnapshot, handleSwitchResult]);
|
||||
|
||||
useEffect(() => {
|
||||
let disposed = false;
|
||||
|
||||
const pollEvents = async () => {
|
||||
if (disposed) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const events = await getProfileSwitchEvents(switchEventSeqRef.current);
|
||||
if (events.length > 0) {
|
||||
switchEventSeqRef.current = events[events.length - 1].sequence;
|
||||
setSwitchEventSeq(switchEventSeqRef.current);
|
||||
events.forEach((event) => handleSwitchResult(event.result));
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn("[DataProvider] Failed to poll switch events:", error);
|
||||
} finally {
|
||||
if (!disposed) {
|
||||
const nextDelay =
|
||||
switchStatus &&
|
||||
(switchStatus.isSwitching || (switchStatus.queue?.length ?? 0) > 0)
|
||||
? 250
|
||||
: 1000;
|
||||
scheduleTimeout(pollEvents, nextDelay);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
scheduleTimeout(pollEvents, 0);
|
||||
|
||||
return () => {
|
||||
disposed = true;
|
||||
};
|
||||
}, [scheduleTimeout, handleSwitchResult, switchStatus, setSwitchEventSeq]);
|
||||
|
||||
useEffect(() => {
|
||||
const cleanupFns: Array<() => void> = [];
|
||||
|
||||
const registerCleanup = (fn: () => void) => {
|
||||
if (isUnmounted) {
|
||||
try {
|
||||
fn();
|
||||
} catch (error) {
|
||||
console.error("[DataProvider] Immediate cleanup failed:", error);
|
||||
}
|
||||
} else {
|
||||
cleanupFns.push(fn);
|
||||
}
|
||||
cleanupFns.push(fn);
|
||||
};
|
||||
|
||||
const addWindowListener = (eventName: string, handler: EventListener) => {
|
||||
@@ -87,140 +343,319 @@ export const AppDataProvider = ({
|
||||
return () => window.removeEventListener(eventName, handler);
|
||||
};
|
||||
|
||||
const scheduleTimeout = (
|
||||
callback: () => void | Promise<void>,
|
||||
delay: number,
|
||||
const runProfileChangedPipeline = (
|
||||
profileId: string | null,
|
||||
source: "tauri" | "window",
|
||||
) => {
|
||||
if (isUnmounted) return -1;
|
||||
|
||||
const timeoutId = window.setTimeout(() => {
|
||||
scheduledTimeouts.delete(timeoutId);
|
||||
if (!isUnmounted) {
|
||||
void callback();
|
||||
}
|
||||
}, delay);
|
||||
|
||||
scheduledTimeouts.add(timeoutId);
|
||||
return timeoutId;
|
||||
};
|
||||
|
||||
const clearAllTimeouts = () => {
|
||||
scheduledTimeouts.forEach((timeoutId) => clearTimeout(timeoutId));
|
||||
scheduledTimeouts.clear();
|
||||
};
|
||||
|
||||
const handleProfileChanged = (event: { payload: string }) => {
|
||||
const newProfileId = event.payload;
|
||||
const now = Date.now();
|
||||
const meta = profileChangeMetaRef.current;
|
||||
|
||||
if (
|
||||
lastProfileId === newProfileId &&
|
||||
now - lastUpdateTime < refreshThrottle
|
||||
meta.lastProfileId === profileId &&
|
||||
now - meta.lastEventTs < PROFILE_EVENT_DEDUP_MS
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
lastProfileId = newProfileId;
|
||||
lastUpdateTime = now;
|
||||
meta.lastProfileId = profileId;
|
||||
meta.lastEventTs = now;
|
||||
|
||||
scheduleTimeout(() => {
|
||||
refreshRules().catch((error) =>
|
||||
console.warn("[DataProvider] Rules refresh failed:", error),
|
||||
);
|
||||
refreshRuleProviders().catch((error) =>
|
||||
console.warn("[DataProvider] Rule providers refresh failed:", error),
|
||||
);
|
||||
}, 200);
|
||||
};
|
||||
|
||||
const handleRefreshClash = () => {
|
||||
const now = Date.now();
|
||||
if (now - lastUpdateTime <= refreshThrottle) return;
|
||||
|
||||
lastUpdateTime = now;
|
||||
scheduleTimeout(() => {
|
||||
refreshProxy().catch((error) =>
|
||||
console.error("[DataProvider] Proxy refresh failed:", error),
|
||||
);
|
||||
}, 200);
|
||||
};
|
||||
|
||||
const handleRefreshProxy = () => {
|
||||
const now = Date.now();
|
||||
if (now - lastUpdateTime <= refreshThrottle) return;
|
||||
|
||||
lastUpdateTime = now;
|
||||
scheduleTimeout(() => {
|
||||
refreshProxy().catch((error) =>
|
||||
console.warn("[DataProvider] Proxy refresh failed:", error),
|
||||
);
|
||||
}, 200);
|
||||
};
|
||||
|
||||
const initializeListeners = async () => {
|
||||
try {
|
||||
const unlistenProfile = await listen<string>(
|
||||
"profile-changed",
|
||||
handleProfileChanged,
|
||||
);
|
||||
registerCleanup(unlistenProfile);
|
||||
} catch (error) {
|
||||
console.error("[AppDataProvider] 监听 Profile 事件失败:", error);
|
||||
if (profileId) {
|
||||
void seedProxySnapshot(profileId);
|
||||
}
|
||||
|
||||
try {
|
||||
const unlistenClash = await listen(
|
||||
"verge://refresh-clash-config",
|
||||
handleRefreshClash,
|
||||
queueProxyRefresh(`profile-changed-${source}`, 500);
|
||||
|
||||
scheduleTimeout(() => {
|
||||
void fetchProfilesConfig()
|
||||
.then((data) => {
|
||||
commitProfileSnapshot(data);
|
||||
globalMutate("getProfiles", data, false);
|
||||
})
|
||||
.catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Failed to refresh profiles after profile change:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
void refreshProxyProviders().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Proxy providers refresh failed after profile change:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
const unlistenProxy = await listen(
|
||||
"verge://refresh-proxy-config",
|
||||
handleRefreshProxy,
|
||||
void refreshRules().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Rules refresh failed after profile change:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
void refreshRuleProviders().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Rule providers refresh failed after profile change:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
}, 200);
|
||||
};
|
||||
|
||||
registerCleanup(() => {
|
||||
unlistenClash();
|
||||
unlistenProxy();
|
||||
});
|
||||
} catch (error) {
|
||||
console.warn("[AppDataProvider] 设置 Tauri 事件监听器失败:", error);
|
||||
const handleProfileChanged = (event: { payload: string }) => {
|
||||
runProfileChangedPipeline(event.payload ?? null, "tauri");
|
||||
};
|
||||
|
||||
const fallbackHandlers: Array<[string, EventListener]> = [
|
||||
["verge://refresh-clash-config", handleRefreshClash],
|
||||
["verge://refresh-proxy-config", handleRefreshProxy],
|
||||
];
|
||||
const runRefreshClashPipeline = (source: "tauri" | "window") => {
|
||||
const now = Date.now();
|
||||
if (now - lastClashRefreshAtRef.current < CLASH_REFRESH_DEDUP_MS) {
|
||||
return;
|
||||
}
|
||||
|
||||
fallbackHandlers.forEach(([eventName, handler]) => {
|
||||
registerCleanup(addWindowListener(eventName, handler));
|
||||
});
|
||||
lastClashRefreshAtRef.current = now;
|
||||
|
||||
scheduleTimeout(() => {
|
||||
void refreshClashConfig().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Clash config refresh failed after backend update:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
void refreshRules().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Rules refresh failed after backend update:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
void refreshRuleProviders().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Rule providers refresh failed after backend update:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
void refreshProxyProviders().catch((error) =>
|
||||
console.warn(
|
||||
"[AppDataProvider] Proxy providers refresh failed after backend update:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
}, 0);
|
||||
|
||||
queueProxyRefresh(`refresh-clash-config-${source}`, 400);
|
||||
};
|
||||
|
||||
const handleProfileUpdateCompleted = (_: { payload: { uid: string } }) => {
|
||||
queueProxyRefresh("profile-update-completed", 3000);
|
||||
if (!isUnmountedRef.current) {
|
||||
scheduleTimeout(() => {
|
||||
void refreshProxyProviders().catch((error) =>
|
||||
console.warn(
|
||||
"[DataProvider] Proxy providers refresh failed after profile update completed:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
}, 0);
|
||||
}
|
||||
};
|
||||
|
||||
void initializeListeners();
|
||||
const isProxiesPayload = (
|
||||
value: unknown,
|
||||
): value is ProxiesUpdatedPayload => {
|
||||
if (!value || typeof value !== "object") {
|
||||
return false;
|
||||
}
|
||||
const candidate = value as Partial<ProxiesUpdatedPayload>;
|
||||
return candidate.proxies !== undefined && candidate.proxies !== null;
|
||||
};
|
||||
|
||||
const handleProxiesUpdatedPayload = (
|
||||
rawPayload: unknown,
|
||||
source: "tauri" | "window",
|
||||
) => {
|
||||
if (!isProxiesPayload(rawPayload)) {
|
||||
console.warn(
|
||||
`[AppDataProvider] Ignored ${source} proxies-updated payload`,
|
||||
rawPayload,
|
||||
);
|
||||
queueProxyRefresh(`proxies-updated-${source}-invalid`, 500);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
applyLiveProxyPayload(rawPayload);
|
||||
} catch (error) {
|
||||
console.warn(
|
||||
`[AppDataProvider] Failed to apply ${source} proxies-updated payload`,
|
||||
error,
|
||||
);
|
||||
queueProxyRefresh(`proxies-updated-${source}-apply-failed`, 500);
|
||||
}
|
||||
};
|
||||
|
||||
listen<{ uid: string }>(
|
||||
"profile-update-completed",
|
||||
handleProfileUpdateCompleted,
|
||||
)
|
||||
.then(registerCleanup)
|
||||
.catch((error) =>
|
||||
console.error(
|
||||
"[AppDataProvider] failed to attach profile update listeners:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
|
||||
listen<string>("profile-changed", handleProfileChanged)
|
||||
.then(registerCleanup)
|
||||
.catch((error) =>
|
||||
console.error(
|
||||
"[AppDataProvider] failed to attach profile-changed listener:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
|
||||
listen<ProxiesUpdatedPayload>("proxies-updated", (event) => {
|
||||
handleProxiesUpdatedPayload(event.payload, "tauri");
|
||||
})
|
||||
.then(registerCleanup)
|
||||
.catch((error) =>
|
||||
console.error(
|
||||
"[AppDataProvider] failed to attach proxies-updated listener:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
|
||||
listen("verge://refresh-clash-config", () => {
|
||||
runRefreshClashPipeline("tauri");
|
||||
})
|
||||
.then(registerCleanup)
|
||||
.catch((error) =>
|
||||
console.error(
|
||||
"[AppDataProvider] failed to attach refresh-clash-config listener:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
|
||||
listen("verge://refresh-proxy-config", () => {
|
||||
queueProxyRefresh("refresh-proxy-config-tauri", 500);
|
||||
})
|
||||
.then(registerCleanup)
|
||||
.catch((error) =>
|
||||
console.error(
|
||||
"[AppDataProvider] failed to attach refresh-proxy-config listener:",
|
||||
error,
|
||||
),
|
||||
);
|
||||
|
||||
const fallbackHandlers: Array<[string, EventListener]> = [
|
||||
[
|
||||
"profile-update-completed",
|
||||
((event: Event) => {
|
||||
const payload = (event as CustomEvent<{ uid: string }>).detail ?? {
|
||||
uid: "",
|
||||
};
|
||||
handleProfileUpdateCompleted({ payload });
|
||||
}) as EventListener,
|
||||
],
|
||||
[
|
||||
"profile-changed",
|
||||
((event: Event) => {
|
||||
const payload = (event as CustomEvent<string | null>).detail ?? null;
|
||||
runProfileChangedPipeline(payload, "window");
|
||||
}) as EventListener,
|
||||
],
|
||||
[
|
||||
"proxies-updated",
|
||||
((event: Event) => {
|
||||
const payload = (event as CustomEvent<ProxiesUpdatedPayload>).detail;
|
||||
handleProxiesUpdatedPayload(payload, "window");
|
||||
}) as EventListener,
|
||||
],
|
||||
[
|
||||
"verge://refresh-clash-config",
|
||||
(() => {
|
||||
runRefreshClashPipeline("window");
|
||||
}) as EventListener,
|
||||
],
|
||||
[
|
||||
"verge://refresh-proxy-config",
|
||||
(() => {
|
||||
queueProxyRefresh("refresh-proxy-config-window", 500);
|
||||
}) as EventListener,
|
||||
],
|
||||
];
|
||||
|
||||
fallbackHandlers.forEach(([eventName, handler]) => {
|
||||
registerCleanup(addWindowListener(eventName, handler));
|
||||
});
|
||||
|
||||
return () => {
|
||||
isUnmounted = true;
|
||||
clearAllTimeouts();
|
||||
|
||||
const errors: Error[] = [];
|
||||
cleanupFns.splice(0).forEach((fn) => {
|
||||
cleanupFns.forEach((fn) => {
|
||||
try {
|
||||
fn();
|
||||
} catch (error) {
|
||||
errors.push(
|
||||
error instanceof Error ? error : new Error(String(error)),
|
||||
);
|
||||
console.error("[AppDataProvider] cleanup error:", error);
|
||||
}
|
||||
});
|
||||
|
||||
if (errors.length > 0) {
|
||||
console.error(
|
||||
`[DataProvider] ${errors.length} errors during cleanup:`,
|
||||
errors,
|
||||
);
|
||||
}
|
||||
};
|
||||
}, [refreshProxy, refreshRules, refreshRuleProviders]);
|
||||
}, [
|
||||
commitProfileSnapshot,
|
||||
queueProxyRefresh,
|
||||
refreshClashConfig,
|
||||
refreshProxyProviders,
|
||||
refreshRuleProviders,
|
||||
refreshRules,
|
||||
scheduleTimeout,
|
||||
seedProxySnapshot,
|
||||
]);
|
||||
|
||||
const switchTargetProfileId =
|
||||
switchStatus?.active?.profileId ??
|
||||
(switchStatus && switchStatus.queue.length > 0
|
||||
? switchStatus.queue[0].profileId
|
||||
: null);
|
||||
|
||||
const proxyTargetProfileId =
|
||||
switchTargetProfileId ?? pendingProxyProfileId ?? proxyProfileId ?? null;
|
||||
const displayProxyStateRef = useRef<{
|
||||
view: ProxiesView | null;
|
||||
profileId: string | null;
|
||||
}>({
|
||||
view: proxyView,
|
||||
profileId: proxyTargetProfileId,
|
||||
});
|
||||
|
||||
const currentDisplay = displayProxyStateRef.current;
|
||||
|
||||
if (!proxyView) {
|
||||
if (
|
||||
currentDisplay.view !== null ||
|
||||
currentDisplay.profileId !== proxyTargetProfileId
|
||||
) {
|
||||
displayProxyStateRef.current = {
|
||||
view: null,
|
||||
profileId: proxyTargetProfileId,
|
||||
};
|
||||
}
|
||||
} else if (proxyHydration === "live") {
|
||||
if (
|
||||
currentDisplay.view !== proxyView ||
|
||||
currentDisplay.profileId !== proxyTargetProfileId
|
||||
) {
|
||||
displayProxyStateRef.current = {
|
||||
view: proxyView,
|
||||
profileId: proxyTargetProfileId,
|
||||
};
|
||||
}
|
||||
} else if (!currentDisplay.view) {
|
||||
displayProxyStateRef.current = {
|
||||
view: proxyView,
|
||||
profileId: proxyTargetProfileId,
|
||||
};
|
||||
}
|
||||
const displayProxyState = displayProxyStateRef.current;
|
||||
const proxyDisplayProfileId = displayProxyState.profileId;
|
||||
const proxiesForRender = displayProxyState.view ?? proxyView;
|
||||
const isProxyRefreshPending =
|
||||
(switchStatus?.isSwitching ?? false) ||
|
||||
proxyHydration !== "live" ||
|
||||
proxyTargetProfileId !== proxyDisplayProfileId;
|
||||
|
||||
const { data: sysproxy, mutate: refreshSysproxy } = useSWR(
|
||||
"getSystemProxy",
|
||||
@@ -240,10 +675,10 @@ export const AppDataProvider = ({
|
||||
errorRetryCount: 1,
|
||||
});
|
||||
|
||||
// 提供统一的刷新方法
|
||||
// Provide unified refresh method
|
||||
const refreshAll = useCallback(async () => {
|
||||
await Promise.all([
|
||||
refreshProxy(),
|
||||
fetchLiveProxies(),
|
||||
refreshClashConfig(),
|
||||
refreshRules(),
|
||||
refreshSysproxy(),
|
||||
@@ -251,7 +686,6 @@ export const AppDataProvider = ({
|
||||
refreshRuleProviders(),
|
||||
]);
|
||||
}, [
|
||||
refreshProxy,
|
||||
refreshClashConfig,
|
||||
refreshRules,
|
||||
refreshSysproxy,
|
||||
@@ -259,22 +693,22 @@ export const AppDataProvider = ({
|
||||
refreshRuleProviders,
|
||||
]);
|
||||
|
||||
// 聚合所有数据
|
||||
// Aggregate data into context value
|
||||
const value = useMemo(() => {
|
||||
// 计算系统代理地址
|
||||
// Compute the system proxy address
|
||||
const calculateSystemProxyAddress = () => {
|
||||
if (!verge || !clashConfig) return "-";
|
||||
|
||||
const isPacMode = verge.proxy_auto_config ?? false;
|
||||
|
||||
if (isPacMode) {
|
||||
// PAC模式：显示我们期望设置的代理地址
|
||||
// PAC mode: display the desired proxy address
|
||||
const proxyHost = verge.proxy_host || "127.0.0.1";
|
||||
const proxyPort =
|
||||
verge.verge_mixed_port || clashConfig.mixedPort || 7897;
|
||||
return `${proxyHost}:${proxyPort}`;
|
||||
} else {
|
||||
// HTTP代理模式：优先使用系统地址，但如果格式不正确则使用期望地址
|
||||
// HTTP proxy mode: prefer system address, fallback to desired address if invalid
|
||||
const systemServer = sysproxy?.server;
|
||||
if (
|
||||
systemServer &&
|
||||
@@ -283,7 +717,7 @@ export const AppDataProvider = ({
|
||||
) {
|
||||
return systemServer;
|
||||
} else {
|
||||
// 系统地址无效，返回期望的代理地址
|
||||
// System address invalid: fallback to desired proxy address
|
||||
const proxyHost = verge.proxy_host || "127.0.0.1";
|
||||
const proxyPort =
|
||||
verge.verge_mixed_port || clashConfig.mixedPort || 7897;
|
||||
@@ -293,22 +727,27 @@ export const AppDataProvider = ({
|
||||
};
|
||||
|
||||
return {
|
||||
// 数据
|
||||
proxies: proxiesData,
|
||||
// Data
|
||||
proxies: proxiesForRender,
|
||||
proxyHydration,
|
||||
proxyTargetProfileId,
|
||||
proxyDisplayProfileId,
|
||||
isProxyRefreshPending,
|
||||
switchStatus: switchStatus ?? null,
|
||||
clashConfig,
|
||||
rules: rulesData?.rules || [],
|
||||
sysproxy,
|
||||
runningMode,
|
||||
uptime: uptimeData || 0,
|
||||
|
||||
// 提供者数据
|
||||
// Provider data
|
||||
proxyProviders: proxyProviders || {},
|
||||
ruleProviders: ruleProviders?.providers || {},
|
||||
|
||||
systemProxyAddress: calculateSystemProxyAddress(),
|
||||
|
||||
// 刷新方法
|
||||
refreshProxy,
|
||||
// Refresh helpers
|
||||
refreshProxy: fetchLiveProxies,
|
||||
refreshClashConfig,
|
||||
refreshRules,
|
||||
refreshSysproxy,
|
||||
@@ -317,7 +756,12 @@ export const AppDataProvider = ({
|
||||
refreshAll,
|
||||
} as AppDataContextType;
|
||||
}, [
|
||||
proxiesData,
|
||||
proxiesForRender,
|
||||
proxyHydration,
|
||||
proxyTargetProfileId,
|
||||
proxyDisplayProfileId,
|
||||
isProxyRefreshPending,
|
||||
switchStatus,
|
||||
clashConfig,
|
||||
rulesData,
|
||||
sysproxy,
|
||||
@@ -326,7 +770,6 @@ export const AppDataProvider = ({
|
||||
proxyProviders,
|
||||
ruleProviders,
|
||||
verge,
|
||||
refreshProxy,
|
||||
refreshClashConfig,
|
||||
refreshRules,
|
||||
refreshSysproxy,
|
||||
|
||||
@@ -4,6 +4,52 @@ import { getProxies, getProxyProviders } from "tauri-plugin-mihomo-api";
|
||||
|
||||
import { showNotice } from "@/services/noticeService";
|
||||
|
||||
export type ProxyProviderRecord = Record<
|
||||
string,
|
||||
IProxyProviderItem | undefined
|
||||
>;
|
||||
|
||||
export interface SwitchTaskStatus {
|
||||
taskId: number;
|
||||
profileId: string;
|
||||
notify: boolean;
|
||||
stage?: number | null;
|
||||
queued: boolean;
|
||||
}
|
||||
|
||||
export interface SwitchResultStatus {
|
||||
taskId: number;
|
||||
profileId: string;
|
||||
success: boolean;
|
||||
cancelled?: boolean;
|
||||
finishedAt: number;
|
||||
errorStage?: string | null;
|
||||
errorDetail?: string | null;
|
||||
}
|
||||
|
||||
export interface ProfileSwitchStatus {
|
||||
isSwitching: boolean;
|
||||
active?: SwitchTaskStatus | null;
|
||||
queue: SwitchTaskStatus[];
|
||||
cleanupProfiles: string[];
|
||||
lastResult?: SwitchResultStatus | null;
|
||||
lastUpdated: number;
|
||||
}
|
||||
|
||||
export interface SwitchResultEvent {
|
||||
sequence: number;
|
||||
result: SwitchResultStatus;
|
||||
}
|
||||
|
||||
// Persist the last proxy provider payload so UI can render while waiting on Mihomo.
|
||||
let cachedProxyProviders: ProxyProviderRecord | null = null;
|
||||
|
||||
export const getCachedProxyProviders = () => cachedProxyProviders;
|
||||
|
||||
export const setCachedProxyProviders = (record: ProxyProviderRecord | null) => {
|
||||
cachedProxyProviders = record;
|
||||
};
|
||||
|
||||
export async function copyClashEnv() {
|
||||
return invoke<void>("copy_clash_env");
|
||||
}
|
||||
@@ -20,6 +66,14 @@ export async function patchProfilesConfig(profiles: IProfilesConfig) {
|
||||
return invoke<void>("patch_profiles_config", { profiles });
|
||||
}
|
||||
|
||||
// Triggers the async state-machine driven switch flow on the backend.
|
||||
export async function switchProfileCommand(
|
||||
profileIndex: string,
|
||||
notifySuccess: boolean,
|
||||
) {
|
||||
return invoke<boolean>("switch_profile", { profileIndex, notifySuccess });
|
||||
}
|
||||
|
||||
export async function createProfile(
|
||||
item: Partial<IProfileItem>,
|
||||
fileData?: string | null,
|
||||
@@ -113,27 +167,29 @@ export async function syncTrayProxySelection() {
|
||||
return invoke<void>("sync_tray_proxy_selection");
|
||||
}
|
||||
|
||||
export async function calcuProxies(): Promise<{
|
||||
export interface ProxiesView {
|
||||
global: IProxyGroupItem;
|
||||
direct: IProxyItem;
|
||||
groups: IProxyGroupItem[];
|
||||
records: Record<string, IProxyItem>;
|
||||
proxies: IProxyItem[];
|
||||
}> {
|
||||
const [proxyResponse, providerResponse] = await Promise.all([
|
||||
getProxies(),
|
||||
calcuProxyProviders(),
|
||||
]);
|
||||
}
|
||||
|
||||
export function buildProxyView(
|
||||
proxyResponse: Awaited<ReturnType<typeof getProxies>>,
|
||||
providerRecord?: ProxyProviderRecord | null,
|
||||
): ProxiesView {
|
||||
const proxyRecord = proxyResponse.proxies;
|
||||
const providerRecord = providerResponse;
|
||||
|
||||
// provider name map
|
||||
const providerMap = Object.fromEntries(
|
||||
Object.entries(providerRecord).flatMap(([provider, item]) =>
|
||||
item!.proxies.map((p) => [p.name, { ...p, provider }]),
|
||||
),
|
||||
);
|
||||
const providerMap = providerRecord
|
||||
? Object.fromEntries(
|
||||
Object.entries(providerRecord).flatMap(([provider, item]) => {
|
||||
if (!item) return [];
|
||||
return item.proxies.map((p) => [p.name, { ...p, provider }]);
|
||||
}),
|
||||
)
|
||||
: {};
|
||||
|
||||
// compatible with proxy-providers
|
||||
const generateItem = (name: string) => {
|
||||
@@ -207,16 +263,56 @@ export async function calcuProxies(): Promise<{
|
||||
};
|
||||
}
|
||||
|
||||
export async function calcuProxies(): Promise<ProxiesView> {
|
||||
const proxyResponse = await getProxies();
|
||||
|
||||
let providerRecord = cachedProxyProviders;
|
||||
if (!providerRecord) {
|
||||
try {
|
||||
providerRecord = await calcuProxyProviders();
|
||||
} catch (error) {
|
||||
console.warn("[calcuProxies] 代理提供者加载失败:", error);
|
||||
}
|
||||
}
|
||||
|
||||
return buildProxyView(proxyResponse, providerRecord);
|
||||
}
|
||||
|
||||
export async function calcuProxyProviders() {
|
||||
const providers = await getProxyProviders();
|
||||
return Object.fromEntries(
|
||||
Object.entries(providers.providers)
|
||||
.sort()
|
||||
.filter(
|
||||
([_, item]) =>
|
||||
item?.vehicleType === "HTTP" || item?.vehicleType === "File",
|
||||
),
|
||||
);
|
||||
const mappedEntries = Object.entries(providers.providers)
|
||||
.sort()
|
||||
.filter(
|
||||
([, item]) =>
|
||||
item?.vehicleType === "HTTP" || item?.vehicleType === "File",
|
||||
)
|
||||
.map(([name, item]) => {
|
||||
if (!item) return [name, undefined] as const;
|
||||
|
||||
const subscriptionInfo =
|
||||
item.subscriptionInfo && typeof item.subscriptionInfo === "object"
|
||||
? {
|
||||
Upload: item.subscriptionInfo.Upload ?? 0,
|
||||
Download: item.subscriptionInfo.Download ?? 0,
|
||||
Total: item.subscriptionInfo.Total ?? 0,
|
||||
Expire: item.subscriptionInfo.Expire ?? 0,
|
||||
}
|
||||
: undefined;
|
||||
|
||||
const normalized: IProxyProviderItem = {
|
||||
name: item.name,
|
||||
type: item.type,
|
||||
proxies: item.proxies ?? [],
|
||||
updatedAt: item.updatedAt ?? "",
|
||||
vehicleType: item.vehicleType ?? "",
|
||||
subscriptionInfo,
|
||||
};
|
||||
return [name, normalized] as const;
|
||||
});
|
||||
|
||||
const mapped = Object.fromEntries(mappedEntries) as ProxyProviderRecord;
|
||||
cachedProxyProviders = mapped;
|
||||
return mapped;
|
||||
}
|
||||
|
||||
export async function getClashLogs() {
|
||||
@@ -555,3 +651,13 @@ export const isAdmin = async () => {
|
||||
export async function getNextUpdateTime(uid: string) {
|
||||
return invoke<number | null>("get_next_update_time", { uid });
|
||||
}
|
||||
|
||||
export async function getProfileSwitchStatus() {
|
||||
return invoke<ProfileSwitchStatus>("get_profile_switch_status");
|
||||
}
|
||||
|
||||
export async function getProfileSwitchEvents(afterSequence: number) {
|
||||
return invoke<SwitchResultEvent[]>("get_profile_switch_events", {
|
||||
afterSequence,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -14,10 +14,20 @@ let nextId = 0;
|
||||
let notices: NoticeItem[] = [];
|
||||
const listeners: Set<Listener> = new Set();
|
||||
|
||||
function notifyListeners() {
|
||||
function flushListeners() {
|
||||
listeners.forEach((listener) => listener([...notices])); // Pass a copy
|
||||
}
|
||||
|
||||
let notifyScheduled = false;
|
||||
function scheduleNotify() {
|
||||
if (notifyScheduled) return;
|
||||
notifyScheduled = true;
|
||||
requestAnimationFrame(() => {
|
||||
notifyScheduled = false;
|
||||
flushListeners();
|
||||
});
|
||||
}
|
||||
|
||||
// Shows a notification.
|
||||
|
||||
export function showNotice(
|
||||
@@ -44,7 +54,7 @@ export function showNotice(
|
||||
}
|
||||
|
||||
notices = [...notices, newNotice];
|
||||
notifyListeners();
|
||||
scheduleNotify();
|
||||
return id;
|
||||
}
|
||||
|
||||
@@ -56,7 +66,7 @@ export function hideNotice(id: number) {
|
||||
clearTimeout(notice.timerId); // Clear timeout if manually closed
|
||||
}
|
||||
notices = notices.filter((n) => n.id !== id);
|
||||
notifyListeners();
|
||||
scheduleNotify();
|
||||
}
|
||||
|
||||
// Subscribes a listener function to notice state changes.
|
||||
@@ -77,5 +87,5 @@ export function clearAllNotices() {
|
||||
if (n.timerId) clearTimeout(n.timerId);
|
||||
});
|
||||
notices = [];
|
||||
notifyListeners();
|
||||
scheduleNotify();
|
||||
}
|
||||
|
||||
24
src/services/refresh.ts
Normal file
24
src/services/refresh.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
import { mutate } from "swr";
|
||||
|
||||
import { getAxios } from "@/services/api";
|
||||
|
||||
export const refreshClashData = async () => {
|
||||
try {
|
||||
await getAxios(true);
|
||||
} catch (error) {
|
||||
console.warn("[Refresh] getAxios failed during clash refresh:", error);
|
||||
}
|
||||
|
||||
mutate("getProxies");
|
||||
mutate("getVersion");
|
||||
mutate("getClashConfig");
|
||||
mutate("getProxyProviders");
|
||||
};
|
||||
|
||||
export const refreshVergeData = () => {
|
||||
mutate("getVergeConfig");
|
||||
mutate("getSystemProxy");
|
||||
mutate("getAutotemProxy");
|
||||
mutate("getRunningMode");
|
||||
mutate("isServiceAvailable");
|
||||
};
|
||||
59
src/stores/profile-store.ts
Normal file
59
src/stores/profile-store.ts
Normal file
@@ -0,0 +1,59 @@
|
||||
import { create } from "zustand";
|
||||
|
||||
import type { SwitchResultStatus } from "@/services/cmds";
|
||||
|
||||
interface ProfileStoreState {
|
||||
data: IProfilesConfig | null;
|
||||
optimisticCurrent: string | null;
|
||||
isHydrating: boolean;
|
||||
lastEventSeq: number;
|
||||
lastResult: SwitchResultStatus | null;
|
||||
applySwitchResult: (result: SwitchResultStatus) => void;
|
||||
commitHydrated: (data: IProfilesConfig) => void;
|
||||
setLastEventSeq: (sequence: number) => void;
|
||||
}
|
||||
|
||||
export const useProfileStore = create<ProfileStoreState>((set) => ({
|
||||
data: null,
|
||||
optimisticCurrent: null,
|
||||
isHydrating: false,
|
||||
lastEventSeq: 0,
|
||||
lastResult: null,
|
||||
applySwitchResult(result) {
|
||||
// Record the optimistic switch outcome so the UI reflects the desired profile immediately.
|
||||
set((state) => ({
|
||||
lastResult: result,
|
||||
optimisticCurrent: result.success ? result.profileId : null,
|
||||
isHydrating: result.success ? true : state.isHydrating,
|
||||
}));
|
||||
},
|
||||
commitHydrated(data) {
|
||||
set({
|
||||
data,
|
||||
optimisticCurrent: null,
|
||||
isHydrating: false,
|
||||
});
|
||||
},
|
||||
setLastEventSeq(sequence) {
|
||||
set({ lastEventSeq: sequence });
|
||||
},
|
||||
}));
|
||||
|
||||
export const selectEffectiveProfiles = (state: ProfileStoreState) => {
|
||||
if (!state.data) {
|
||||
return null;
|
||||
}
|
||||
// Prefer the optimistic selection while hydration is pending.
|
||||
const current = state.optimisticCurrent ?? state.data.current;
|
||||
if (
|
||||
state.optimisticCurrent &&
|
||||
state.optimisticCurrent !== state.data.current
|
||||
) {
|
||||
return { ...state.data, current } as IProfilesConfig;
|
||||
}
|
||||
return state.data;
|
||||
};
|
||||
|
||||
export const selectIsHydrating = (state: ProfileStoreState) =>
|
||||
state.isHydrating;
|
||||
export const selectLastResult = (state: ProfileStoreState) => state.lastResult;
|
||||
298
src/stores/proxy-store.ts
Normal file
298
src/stores/proxy-store.ts
Normal file
@@ -0,0 +1,298 @@
|
||||
import type { getProxies } from "tauri-plugin-mihomo-api";
|
||||
import { create } from "zustand";
|
||||
|
||||
import {
|
||||
ProxiesView,
|
||||
ProxyProviderRecord,
|
||||
buildProxyView,
|
||||
calcuProxies,
|
||||
getCachedProxyProviders,
|
||||
setCachedProxyProviders,
|
||||
} from "@/services/cmds";
|
||||
import { AsyncEventQueue, nextTick } from "@/utils/asyncQueue";
|
||||
|
||||
type ProxyHydration = "none" | "snapshot" | "live";
|
||||
type RawProxiesResponse = Awaited<ReturnType<typeof getProxies>>;
|
||||
|
||||
export interface ProxiesUpdatedPayload {
|
||||
proxies: RawProxiesResponse;
|
||||
providers?: Record<string, unknown> | null;
|
||||
emittedAt?: number;
|
||||
profileId?: string | null;
|
||||
}
|
||||
|
||||
interface ProxyStoreState {
|
||||
data: ProxiesView | null;
|
||||
hydration: ProxyHydration;
|
||||
lastUpdated: number | null;
|
||||
lastProfileId: string | null;
|
||||
liveFetchRequestId: number;
|
||||
lastAppliedFetchId: number;
|
||||
pendingProfileId: string | null;
|
||||
pendingSnapshotFetchId: number | null;
|
||||
setSnapshot: (snapshot: ProxiesView, profileId: string) => void;
|
||||
setLive: (payload: ProxiesUpdatedPayload) => void;
|
||||
startLiveFetch: () => number;
|
||||
completeLiveFetch: (requestId: number, view: ProxiesView) => void;
|
||||
clearPendingProfile: () => void;
|
||||
reset: () => void;
|
||||
}
|
||||
|
||||
const normalizeProviderPayload = (
|
||||
raw: ProxiesUpdatedPayload["providers"],
|
||||
): ProxyProviderRecord | null => {
|
||||
if (!raw || typeof raw !== "object") return null;
|
||||
|
||||
const rawRecord = raw as Record<string, any>;
|
||||
const source =
|
||||
rawRecord.providers && typeof rawRecord.providers === "object"
|
||||
? (rawRecord.providers as Record<string, any>)
|
||||
: rawRecord;
|
||||
|
||||
const entries = Object.entries(source)
|
||||
.sort(([a], [b]) => a.localeCompare(b))
|
||||
.filter(([, value]) => {
|
||||
if (!value || typeof value !== "object") {
|
||||
return false;
|
||||
}
|
||||
const vehicleType = value.vehicleType;
|
||||
return vehicleType === "HTTP" || vehicleType === "File";
|
||||
})
|
||||
.map(([name, value]) => {
|
||||
const normalized: IProxyProviderItem = {
|
||||
name: value.name ?? name,
|
||||
type: value.type ?? "",
|
||||
proxies: Array.isArray(value.proxies) ? value.proxies : [],
|
||||
updatedAt: value.updatedAt ?? "",
|
||||
vehicleType: value.vehicleType ?? "",
|
||||
subscriptionInfo:
|
||||
value.subscriptionInfo && typeof value.subscriptionInfo === "object"
|
||||
? {
|
||||
Upload: Number(value.subscriptionInfo.Upload ?? 0),
|
||||
Download: Number(value.subscriptionInfo.Download ?? 0),
|
||||
Total: Number(value.subscriptionInfo.Total ?? 0),
|
||||
Expire: Number(value.subscriptionInfo.Expire ?? 0),
|
||||
}
|
||||
: undefined,
|
||||
};
|
||||
|
||||
return [name, normalized] as const;
|
||||
});
|
||||
|
||||
return Object.fromEntries(entries) as ProxyProviderRecord;
|
||||
};
|
||||
|
||||
export const useProxyStore = create<ProxyStoreState>((set, get) => ({
|
||||
data: null,
|
||||
hydration: "none",
|
||||
lastUpdated: null,
|
||||
lastProfileId: null,
|
||||
liveFetchRequestId: 0,
|
||||
lastAppliedFetchId: 0,
|
||||
pendingProfileId: null,
|
||||
pendingSnapshotFetchId: null,
|
||||
setSnapshot(snapshot, profileId) {
|
||||
const stateBefore = get();
|
||||
|
||||
set((state) => ({
|
||||
data: snapshot,
|
||||
hydration: "snapshot",
|
||||
lastUpdated: null,
|
||||
pendingProfileId: profileId,
|
||||
pendingSnapshotFetchId: state.liveFetchRequestId,
|
||||
}));
|
||||
|
||||
const hasLiveHydration =
|
||||
stateBefore.hydration === "live" &&
|
||||
stateBefore.lastProfileId === profileId;
|
||||
|
||||
if (profileId && !hasLiveHydration) {
|
||||
void fetchLiveProxies().catch((error) => {
|
||||
console.warn(
|
||||
"[ProxyStore] Failed to bootstrap live proxies from snapshot:",
|
||||
error,
|
||||
);
|
||||
scheduleBootstrapLiveFetch(800);
|
||||
});
|
||||
}
|
||||
},
|
||||
setLive(payload) {
|
||||
const state = get();
|
||||
const emittedAt = payload.emittedAt ?? Date.now();
|
||||
|
||||
if (
|
||||
state.hydration === "live" &&
|
||||
state.lastUpdated !== null &&
|
||||
emittedAt <= state.lastUpdated
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
const providersRecord =
|
||||
normalizeProviderPayload(payload.providers) ?? getCachedProxyProviders();
|
||||
|
||||
if (providersRecord) {
|
||||
setCachedProxyProviders(providersRecord);
|
||||
}
|
||||
|
||||
const view = buildProxyView(payload.proxies, providersRecord);
|
||||
const nextProfileId = payload.profileId ?? state.lastProfileId;
|
||||
|
||||
set((current) => ({
|
||||
data: view,
|
||||
hydration: "live",
|
||||
lastUpdated: emittedAt,
|
||||
lastProfileId: nextProfileId ?? null,
|
||||
lastAppliedFetchId: current.liveFetchRequestId,
|
||||
pendingProfileId: null,
|
||||
pendingSnapshotFetchId: null,
|
||||
}));
|
||||
},
|
||||
startLiveFetch() {
|
||||
let nextRequestId = 0;
|
||||
set((state) => {
|
||||
nextRequestId = state.liveFetchRequestId + 1;
|
||||
return {
|
||||
liveFetchRequestId: nextRequestId,
|
||||
};
|
||||
});
|
||||
return nextRequestId;
|
||||
},
|
||||
completeLiveFetch(requestId, view) {
|
||||
const state = get();
|
||||
if (requestId <= state.lastAppliedFetchId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const shouldAdoptPending =
|
||||
state.pendingProfileId !== null &&
|
||||
requestId >= (state.pendingSnapshotFetchId ?? 0);
|
||||
|
||||
set({
|
||||
data: view,
|
||||
hydration: "live",
|
||||
lastUpdated: Date.now(),
|
||||
lastProfileId: shouldAdoptPending
|
||||
? state.pendingProfileId
|
||||
: state.lastProfileId,
|
||||
lastAppliedFetchId: requestId,
|
||||
pendingProfileId: shouldAdoptPending ? null : state.pendingProfileId,
|
||||
pendingSnapshotFetchId: shouldAdoptPending
|
||||
? null
|
||||
: state.pendingSnapshotFetchId,
|
||||
});
|
||||
},
|
||||
clearPendingProfile() {
|
||||
set({
|
||||
pendingProfileId: null,
|
||||
pendingSnapshotFetchId: null,
|
||||
});
|
||||
},
|
||||
reset() {
|
||||
set({
|
||||
data: null,
|
||||
hydration: "none",
|
||||
lastUpdated: null,
|
||||
lastProfileId: null,
|
||||
liveFetchRequestId: 0,
|
||||
lastAppliedFetchId: 0,
|
||||
pendingProfileId: null,
|
||||
pendingSnapshotFetchId: null,
|
||||
});
|
||||
scheduleBootstrapLiveFetch(200);
|
||||
},
|
||||
}));
|
||||
|
||||
const liveApplyQueue = new AsyncEventQueue();
|
||||
let pendingLivePayload: ProxiesUpdatedPayload | null = null;
|
||||
let liveApplyScheduled = false;
|
||||
|
||||
const scheduleLiveApply = () => {
|
||||
if (liveApplyScheduled) return;
|
||||
liveApplyScheduled = true;
|
||||
|
||||
const dispatch = () => {
|
||||
liveApplyScheduled = false;
|
||||
const payload = pendingLivePayload;
|
||||
pendingLivePayload = null;
|
||||
if (!payload) return;
|
||||
|
||||
liveApplyQueue.enqueue(async () => {
|
||||
await nextTick();
|
||||
useProxyStore.getState().setLive(payload);
|
||||
});
|
||||
};
|
||||
|
||||
if (
|
||||
typeof window !== "undefined" &&
|
||||
typeof window.requestAnimationFrame === "function"
|
||||
) {
|
||||
window.requestAnimationFrame(dispatch);
|
||||
} else {
|
||||
setTimeout(dispatch, 16);
|
||||
}
|
||||
};
|
||||
|
||||
export const applyLiveProxyPayload = (payload: ProxiesUpdatedPayload) => {
|
||||
pendingLivePayload = payload;
|
||||
scheduleLiveApply();
|
||||
};
|
||||
|
||||
export const fetchLiveProxies = async () => {
|
||||
const requestId = useProxyStore.getState().startLiveFetch();
|
||||
const view = await calcuProxies();
|
||||
useProxyStore.getState().completeLiveFetch(requestId, view);
|
||||
};
|
||||
|
||||
const MAX_BOOTSTRAP_ATTEMPTS = 5;
|
||||
const BOOTSTRAP_BASE_DELAY_MS = 600;
|
||||
let bootstrapAttempts = 0;
|
||||
let bootstrapTimer: number | null = null;
|
||||
|
||||
function attemptBootstrapLiveFetch() {
|
||||
const state = useProxyStore.getState();
|
||||
if (state.hydration === "live") {
|
||||
bootstrapAttempts = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (bootstrapAttempts >= MAX_BOOTSTRAP_ATTEMPTS) {
|
||||
return;
|
||||
}
|
||||
|
||||
const attemptNumber = ++bootstrapAttempts;
|
||||
|
||||
void fetchLiveProxies()
|
||||
.then(() => {
|
||||
bootstrapAttempts = 0;
|
||||
})
|
||||
.catch((error) => {
|
||||
console.warn(
|
||||
`[ProxyStore] Bootstrap live fetch attempt ${attemptNumber} failed:`,
|
||||
error,
|
||||
);
|
||||
if (attemptNumber < MAX_BOOTSTRAP_ATTEMPTS) {
|
||||
scheduleBootstrapLiveFetch(BOOTSTRAP_BASE_DELAY_MS * attemptNumber);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function scheduleBootstrapLiveFetch(delay = 0) {
|
||||
if (typeof window === "undefined") {
|
||||
return;
|
||||
}
|
||||
|
||||
if (bootstrapTimer !== null) {
|
||||
window.clearTimeout(bootstrapTimer);
|
||||
bootstrapTimer = null;
|
||||
}
|
||||
|
||||
bootstrapTimer = window.setTimeout(() => {
|
||||
bootstrapTimer = null;
|
||||
attemptBootstrapLiveFetch();
|
||||
}, delay);
|
||||
}
|
||||
|
||||
if (typeof window !== "undefined") {
|
||||
void nextTick().then(() => scheduleBootstrapLiveFetch(0));
|
||||
}
|
||||
31
src/utils/asyncQueue.ts
Normal file
31
src/utils/asyncQueue.ts
Normal file
@@ -0,0 +1,31 @@
|
||||
export class AsyncEventQueue {
|
||||
private tail: Promise<void> = Promise.resolve();
|
||||
|
||||
enqueue(task: () => Promise<void> | void) {
|
||||
this.tail = this.tail
|
||||
.then(async () => {
|
||||
await task();
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error("AsyncEventQueue task failed", error);
|
||||
});
|
||||
}
|
||||
|
||||
clear() {
|
||||
this.tail = Promise.resolve();
|
||||
}
|
||||
}
|
||||
|
||||
export const nextTick = () =>
|
||||
new Promise<void>((resolve) => {
|
||||
if (typeof queueMicrotask === "function") {
|
||||
queueMicrotask(resolve);
|
||||
} else {
|
||||
Promise.resolve().then(() => resolve());
|
||||
}
|
||||
});
|
||||
|
||||
export const afterPaint = () =>
|
||||
new Promise<void>((resolve) => {
|
||||
requestAnimationFrame(() => resolve());
|
||||
});
|
||||
205
src/utils/proxy-snapshot.ts
Normal file
205
src/utils/proxy-snapshot.ts
Normal file
@@ -0,0 +1,205 @@
|
||||
import yaml from "js-yaml";
|
||||
|
||||
const createProxyItem = (
|
||||
name: string,
|
||||
partial: Partial<IProxyItem> = {},
|
||||
): IProxyItem => ({
|
||||
name,
|
||||
type: partial.type ?? "unknown",
|
||||
udp: partial.udp ?? false,
|
||||
xudp: partial.xudp ?? false,
|
||||
tfo: partial.tfo ?? false,
|
||||
mptcp: partial.mptcp ?? false,
|
||||
smux: partial.smux ?? false,
|
||||
history: [],
|
||||
provider: partial.provider,
|
||||
testUrl: partial.testUrl,
|
||||
hidden: partial.hidden,
|
||||
icon: partial.icon,
|
||||
fixed: partial.fixed,
|
||||
});
|
||||
|
||||
const createGroupItem = (
|
||||
name: string,
|
||||
all: IProxyItem[],
|
||||
partial: Partial<IProxyGroupItem> = {},
|
||||
): IProxyGroupItem => {
|
||||
const rest = { ...partial } as Partial<IProxyItem>;
|
||||
delete (rest as Partial<IProxyGroupItem>).all;
|
||||
const base = createProxyItem(name, rest);
|
||||
return {
|
||||
...base,
|
||||
all,
|
||||
now: partial.now ?? base.now,
|
||||
};
|
||||
};
|
||||
|
||||
const ensureProxyItem = (
|
||||
map: Map<string, IProxyItem>,
|
||||
name: string,
|
||||
source?: Partial<IProxyItem>,
|
||||
) => {
|
||||
const key = String(name);
|
||||
if (map.has(key)) return map.get(key)!;
|
||||
const item = createProxyItem(key, source);
|
||||
map.set(key, item);
|
||||
return item;
|
||||
};
|
||||
|
||||
const parseProxyEntry = (entry: any): IProxyItem | null => {
|
||||
if (!entry || typeof entry !== "object") return null;
|
||||
const name = entry.name || entry.uid || entry.id;
|
||||
if (!name) return null;
|
||||
return createProxyItem(String(name), {
|
||||
type: entry.type ? String(entry.type) : undefined,
|
||||
udp: Boolean(entry.udp),
|
||||
xudp: Boolean(entry.xudp),
|
||||
tfo: Boolean(entry.tfo),
|
||||
mptcp: Boolean(entry.mptcp),
|
||||
smux: Boolean(entry.smux),
|
||||
testUrl: entry.test_url || entry.testUrl,
|
||||
});
|
||||
};
|
||||
|
||||
const isNonEmptyString = (value: unknown): value is string =>
|
||||
typeof value === "string" && value.trim().length > 0;
|
||||
|
||||
const parseProxyGroup = (
|
||||
entry: any,
|
||||
proxyMap: Map<string, IProxyItem>,
|
||||
): IProxyGroupItem | null => {
|
||||
if (!entry || typeof entry !== "object") return null;
|
||||
const name = entry.name;
|
||||
if (!name) return null;
|
||||
|
||||
const rawProxies: unknown[] = Array.isArray(entry.proxies)
|
||||
? entry.proxies
|
||||
: [];
|
||||
|
||||
const proxyRefs: string[] = rawProxies
|
||||
.filter(isNonEmptyString)
|
||||
.map((item) => item.trim());
|
||||
|
||||
const uniqueNames: string[] = Array.from(new Set(proxyRefs));
|
||||
|
||||
const all = uniqueNames.map((proxyName) =>
|
||||
ensureProxyItem(proxyMap, proxyName),
|
||||
);
|
||||
|
||||
return createGroupItem(String(name), all, {
|
||||
type: entry.type ? String(entry.type) : "Selector",
|
||||
provider: entry.provider,
|
||||
testUrl: entry.testUrl || entry.test_url,
|
||||
now: typeof entry.now === "string" ? entry.now : undefined,
|
||||
});
|
||||
};
|
||||
|
||||
const mapRecords = (
|
||||
proxies: Map<string, IProxyItem>,
|
||||
groups: IProxyGroupItem[],
|
||||
extra: IProxyItem[] = [],
|
||||
): Record<string, IProxyItem> => {
|
||||
const result: Record<string, IProxyItem> = {};
|
||||
proxies.forEach((item, key) => {
|
||||
result[key] = item;
|
||||
});
|
||||
groups.forEach((group) => {
|
||||
result[group.name] = group as unknown as IProxyItem;
|
||||
});
|
||||
extra.forEach((item) => {
|
||||
result[item.name] = item;
|
||||
});
|
||||
return result;
|
||||
};
|
||||
|
||||
export const createProxySnapshotFromProfile = (
|
||||
yamlContent: string,
|
||||
): {
|
||||
global: IProxyGroupItem;
|
||||
direct: IProxyItem;
|
||||
groups: IProxyGroupItem[];
|
||||
records: Record<string, IProxyItem>;
|
||||
proxies: IProxyItem[];
|
||||
} | null => {
|
||||
let parsed: any;
|
||||
try {
|
||||
parsed = yaml.load(yamlContent);
|
||||
} catch (error) {
|
||||
console.warn("[ProxySnapshot] Failed to parse YAML:", error);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!parsed || typeof parsed !== "object") {
|
||||
return null;
|
||||
}
|
||||
|
||||
const proxyMap = new Map<string, IProxyItem>();
|
||||
|
||||
if (Array.isArray((parsed as any).proxies)) {
|
||||
for (const entry of (parsed as any).proxies) {
|
||||
const item = parseProxyEntry(entry);
|
||||
if (item) {
|
||||
proxyMap.set(item.name, item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const proxyProviders = (parsed as any)["proxy-providers"];
|
||||
if (proxyProviders && typeof proxyProviders === "object") {
|
||||
for (const key of Object.keys(proxyProviders)) {
|
||||
const provider = proxyProviders[key];
|
||||
if (provider && Array.isArray(provider.proxies)) {
|
||||
provider.proxies
|
||||
.filter(
|
||||
(proxyName: unknown): proxyName is string =>
|
||||
typeof proxyName === "string",
|
||||
)
|
||||
.forEach((proxyName: string) => ensureProxyItem(proxyMap, proxyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const groups: IProxyGroupItem[] = [];
|
||||
if (Array.isArray((parsed as any)["proxy-groups"])) {
|
||||
for (const entry of (parsed as any)["proxy-groups"]) {
|
||||
const groupItem = parseProxyGroup(entry, proxyMap);
|
||||
if (groupItem) {
|
||||
groups.push(groupItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const direct = createProxyItem("DIRECT", { type: "Direct" });
|
||||
const reject = createProxyItem("REJECT", { type: "Reject" });
|
||||
|
||||
ensureProxyItem(proxyMap, direct.name, direct);
|
||||
ensureProxyItem(proxyMap, reject.name, reject);
|
||||
|
||||
let global = groups.find((group) => group.name === "GLOBAL");
|
||||
if (!global) {
|
||||
const globalRefs = groups.flatMap((group) =>
|
||||
group.all.map((proxy) => proxy.name),
|
||||
);
|
||||
const unique = Array.from(new Set(globalRefs));
|
||||
const all = unique.map((name) => ensureProxyItem(proxyMap, name));
|
||||
global = createGroupItem("GLOBAL", all, {
|
||||
type: "Selector",
|
||||
hidden: true,
|
||||
});
|
||||
groups.unshift(global);
|
||||
}
|
||||
|
||||
const proxies = Array.from(proxyMap.values()).filter(
|
||||
(item) => !groups.some((group) => group.name === item.name),
|
||||
);
|
||||
|
||||
const records = mapRecords(proxyMap, groups, [direct, reject]);
|
||||
|
||||
return {
|
||||
global,
|
||||
direct,
|
||||
groups,
|
||||
records,
|
||||
proxies,
|
||||
};
|
||||
};
|
||||
Reference in New Issue
Block a user