mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-01 12:02:07 +08:00
* Refactor Mihomo API integration and remove crate_mihomo_api
- Removed the `mihomo_api` crate and its dependencies from the project.
- Introduced `IpcManager` for handling IPC communication with Mihomo.
- Implemented IPC methods for managing proxies, connections, and configurations.
- Updated `MihomoManager` to utilize `IpcManager` instead of the removed crate.
- Added platform-specific IPC socket path handling for macOS, Linux, and Windows.
- Cleaned up related tests and configuration files.
* fix: remove duplicate permission entry in desktop capabilities
* refactor: replace MihomoManager with IpcManager and remove Mihomo module
* fix: restore tempfile dependency in dev-dependencies
* fix: update kode-bridge dependency to use git source from the dev branch
* feat: migrate mihomo to use kode-bridge IPC on Windows
This commit implements a comprehensive migration from legacy service IPC to the kode-bridge library for Windows IPC communication. Key changes include:
Replace service_ipc with kode-bridge IpcManager for all mihomo communications
Simplify proxy commands using new caching mechanism with ProxyRequestCache
Add Windows named pipe (\.\pipe\mihomo) and Unix socket IPC endpoint configuration
Update Tauri permissions and dependencies (dashmap, tauri-plugin-notification)
Add IPC logging support and improve error handling
Fix Windows IPC path handling in directory utilities
This migration enables better cross-platform IPC support and improved performance for mihomo proxy core communication.
* doc: add IPC communication with Mihomo kernel, removing Restful API dependency
* fix: standardize logging type naming from IPC to Ipc for consistency
* refactor: clean up and optimize code structure across multiple components and services
- Removed unnecessary comments and whitespace in various files.
- Improved code readability and maintainability by restructuring functions and components.
- Updated localization files for consistency and accuracy.
- Enhanced performance by optimizing hooks and utility functions.
- General code cleanup in settings, pages, and services to adhere to best practices.
* fix: simplify URL formatting in test_proxy_delay method
* fix: update kode-bridge dependency to version 0.1.3 and change source to crates.io
* fix: update macOS target versions in development workflow
* Revert "fix: update macOS target versions in development workflow"
This reverts commit b9831357e4.
* feat: enhance IPC path handling for Unix systems and improve directory safety checks
* feat: add conditional compilation for Unix-specific IPC path handling
* chore: update cagro.lock
* feat: add external controller configuration and UI support
* Refactor proxy and connection management to use IPC-based commands
- Updated `get_proxies` function in `proxy.rs` to call the new IPC command.
- Renamed `get_refresh_proxies` to `get_proxies` in `ipc/general.rs` for consistency.
- Added new IPC commands for managing proxies, connections, and configurations in `cmds.ts`.
- Refactored API calls in various components to use the new IPC commands instead of HTTP requests.
- Improved error handling and response management in the new IPC functions.
- Cleaned up unused API functions in `api.ts` and redirected relevant calls to `cmds.ts`.
- Enhanced connection management features including health checks and updates for proxy providers.
* chore: update dependencies and improve error handling in IPC manager
* fix: downgrade zip dependency from 4.3.0 to 4.2.0
* feat: Implement traffic and memory data monitoring service
- Added `TrafficService` and `TrafficManager` to manage traffic and memory data collection.
- Introduced commands to get traffic and memory data, start and stop the traffic service.
- Integrated IPC calls for traffic and memory data retrieval in the frontend.
- Updated `AppDataProvider` and `EnhancedTrafficStats` components to utilize new data fetching methods.
- Removed WebSocket connections for traffic and memory data, replaced with IPC polling.
- Added logging for better traceability of data fetching and service status.
* refactor: unify external controller handling and improve IPC path resolution
* fix: replace direct IPC path retrieval with guard function for external controller
* fix: convert external controller IPC path to string for proper insertion in config map
* fix: update dependencies and improve IPC response handling
* fix: remove unnecessary unix conditional for ipc path import
* Refactor traffic and memory monitoring to use IPC stream; remove TrafficService and TrafficManager. Introduce new IPC-based data retrieval methods for traffic and memory, including formatted data and system overview. Update frontend components to utilize new APIs for enhanced data display and management.
* chore: bump crate rand version to 0.9.2
* feat: Implement enhanced traffic monitoring system with data compression and sampling
- Introduced `useTrafficMonitorEnhanced` hook for advanced traffic data management.
- Added `TrafficDataSampler` class for handling raw and compressed traffic data.
- Implemented reference counting to manage data collection based on component usage.
- Enhanced data validation with `SystemMonitorValidator` for API responses.
- Created diagnostic tools for monitoring performance and error tracking.
- Updated existing hooks to utilize the new enhanced monitoring features.
- Added utility functions for generating and formatting diagnostic reports.
* feat(ipc): improve URL encoding and error handling for IPC requests
- Add percent-encoding for URL paths to handle special characters properly
- Enhance error handling in update_proxy with proper logging
- Remove excessive debug logging to reduce noise
- Update kode-bridge dependency to v0.1.5
- Fix JSON parsing error handling in PUT requests
Changes include:
- Proper URL encoding for connection IDs, proxy names, and test URLs
- Enhanced error handling with fallback responses in updateProxy
- Comment out verbose debug logs in traffic monitoring and data validation
- Update dependency version for improved IPC functionality
* feat: major improvements in architecture, traffic monitoring, and data validation
* Refactor traffic graph components: Replace EnhancedTrafficGraph with EnhancedCanvasTrafficGraph, improve rendering performance, and enhance visual elements. Remove deprecated code and ensure compatibility with global data management.
* chore: update UPDATELOG.md for v2.4.0 release, refine traffic monitoring system details, and enhance IPC functionality
* chore: update UPDATELOG.md to reflect removal of deprecated MihomoManager and unify IPC control
* refactor: remove global traffic service testing method from cmds.ts
* Update src/components/home/enhanced-canvas-traffic-graph.tsx
* Update src/hooks/use-traffic-monitor-enhanced.ts
* Update src/components/layout/layout-traffic.tsx
* refactor: remove debug state management from LayoutTraffic component
---------
259 lines
7.4 KiB
TypeScript
259 lines
7.4 KiB
TypeScript
import axios, { AxiosInstance } from "axios";
|
||
import { invoke } from "@tauri-apps/api/core";
|
||
import { getClashInfo } from "./cmds";
|
||
|
||
let instancePromise: Promise<AxiosInstance> = null!;
|
||
|
||
async function getInstancePromise() {
|
||
let server = "";
|
||
let secret = "";
|
||
|
||
try {
|
||
const info = await getClashInfo();
|
||
|
||
if (info?.server) {
|
||
server = info.server;
|
||
|
||
// compatible width `external-controller`
|
||
if (server.startsWith(":")) server = `127.0.0.1${server}`;
|
||
else if (/^\d+$/.test(server)) server = `127.0.0.1:${server}`;
|
||
}
|
||
if (info?.secret) secret = info?.secret;
|
||
} catch {}
|
||
|
||
const axiosIns = axios.create({
|
||
baseURL: `http://${server}`,
|
||
headers: secret ? { Authorization: `Bearer ${secret}` } : {},
|
||
timeout: 15000,
|
||
});
|
||
axiosIns.interceptors.response.use((r) => r.data);
|
||
return axiosIns;
|
||
}
|
||
|
||
/// initialize some information
|
||
/// enable force update axiosIns
|
||
export const getAxios = async (force: boolean = false) => {
|
||
if (!instancePromise || force) {
|
||
instancePromise = getInstancePromise();
|
||
}
|
||
return instancePromise;
|
||
};
|
||
|
||
// Get current IP and geolocation information (refactored IP detection with service-specific mappings)
|
||
interface IpInfo {
|
||
ip: string;
|
||
country_code: string;
|
||
country: string;
|
||
region: string;
|
||
city: string;
|
||
organization: string;
|
||
asn: number;
|
||
asn_organization: string;
|
||
longitude: number;
|
||
latitude: number;
|
||
timezone: string;
|
||
}
|
||
|
||
// IP检测服务配置
|
||
interface ServiceConfig {
|
||
url: string;
|
||
mapping: (data: any) => IpInfo;
|
||
timeout?: number; // 保留timeout字段(如有需要)
|
||
}
|
||
|
||
// 可用的IP检测服务列表及字段映射
|
||
const IP_CHECK_SERVICES: ServiceConfig[] = [
|
||
{
|
||
url: "https://api.ip.sb/geoip",
|
||
mapping: (data) => ({
|
||
ip: data.ip || "",
|
||
country_code: data.country_code || "",
|
||
country: data.country || "",
|
||
region: data.region || "",
|
||
city: data.city || "",
|
||
organization: data.organization || data.isp || "",
|
||
asn: data.asn || 0,
|
||
asn_organization: data.asn_organization || "",
|
||
longitude: data.longitude || 0,
|
||
latitude: data.latitude || 0,
|
||
timezone: data.timezone || "",
|
||
}),
|
||
},
|
||
{
|
||
url: "https://ipapi.co/json",
|
||
mapping: (data) => ({
|
||
ip: data.ip || "",
|
||
country_code: data.country_code || "",
|
||
country: data.country_name || "",
|
||
region: data.region || "",
|
||
city: data.city || "",
|
||
organization: data.org || "",
|
||
asn: data.asn ? parseInt(data.asn.replace("AS", "")) : 0,
|
||
asn_organization: data.org || "",
|
||
longitude: data.longitude || 0,
|
||
latitude: data.latitude || 0,
|
||
timezone: data.timezone || "",
|
||
}),
|
||
},
|
||
{
|
||
url: "https://api.ipapi.is/",
|
||
mapping: (data) => ({
|
||
ip: data.ip || "",
|
||
country_code: data.location?.country_code || "",
|
||
country: data.location?.country || "",
|
||
region: data.location?.state || "",
|
||
city: data.location?.city || "",
|
||
organization: data.asn?.org || data.company?.name || "",
|
||
asn: data.asn?.asn || 0,
|
||
asn_organization: data.asn?.org || "",
|
||
longitude: data.location?.longitude || 0,
|
||
latitude: data.location?.latitude || 0,
|
||
timezone: data.location?.timezone || "",
|
||
}),
|
||
},
|
||
{
|
||
url: "https://ipwho.is/",
|
||
mapping: (data) => ({
|
||
ip: data.ip || "",
|
||
country_code: data.country_code || "",
|
||
country: data.country || "",
|
||
region: data.region || "",
|
||
city: data.city || "",
|
||
organization: data.connection?.org || data.connection?.isp || "",
|
||
asn: data.connection?.asn || 0,
|
||
asn_organization: data.connection?.isp || "",
|
||
longitude: data.longitude || 0,
|
||
latitude: data.latitude || 0,
|
||
timezone: data.timezone?.id || "",
|
||
}),
|
||
},
|
||
];
|
||
|
||
// 随机性服务列表洗牌函数
|
||
function shuffleServices() {
|
||
// 过滤无效服务并确保每个元素符合ServiceConfig接口
|
||
const validServices = IP_CHECK_SERVICES.filter(
|
||
(service): service is ServiceConfig =>
|
||
service !== null &&
|
||
service !== undefined &&
|
||
typeof service.url === "string" &&
|
||
typeof service.mapping === "function", // 添加对mapping属性的检查
|
||
);
|
||
|
||
if (validServices.length === 0) {
|
||
console.error("No valid services found in IP_CHECK_SERVICES");
|
||
return [];
|
||
}
|
||
|
||
// 使用单一Fisher-Yates洗牌算法,增强随机性
|
||
const shuffled = [...validServices];
|
||
const length = shuffled.length;
|
||
|
||
// 使用多个种子进行多次洗牌
|
||
const seeds = [Math.random(), Date.now() / 1000, performance.now() / 1000];
|
||
|
||
for (const seed of seeds) {
|
||
const prng = createPrng(seed);
|
||
|
||
// Fisher-Yates洗牌算法
|
||
for (let i = length - 1; i > 0; i--) {
|
||
const j = Math.floor(prng() * (i + 1));
|
||
|
||
// 使用临时变量进行交换,避免解构赋值可能的问题
|
||
const temp = shuffled[i];
|
||
shuffled[i] = shuffled[j];
|
||
shuffled[j] = temp;
|
||
}
|
||
}
|
||
|
||
return shuffled;
|
||
}
|
||
|
||
// 创建一个简单的随机数生成器
|
||
function createPrng(seed: number): () => number {
|
||
// 使用xorshift32算法
|
||
let state = seed >>> 0;
|
||
|
||
// 如果种子为0,设置一个默认值
|
||
if (state === 0) state = 123456789;
|
||
|
||
return function () {
|
||
state ^= state << 13;
|
||
state ^= state >>> 17;
|
||
state ^= state << 5;
|
||
return (state >>> 0) / 4294967296;
|
||
};
|
||
}
|
||
|
||
// 获取当前IP和地理位置信息
|
||
export const getIpInfo = async (): Promise<IpInfo> => {
|
||
// 配置参数
|
||
const maxRetries = 3;
|
||
const serviceTimeout = 5000;
|
||
const overallTimeout = 20000; // 增加总超时时间以容纳延迟
|
||
|
||
const overallTimeoutController = new AbortController();
|
||
const overallTimeoutId = setTimeout(() => {
|
||
overallTimeoutController.abort();
|
||
}, overallTimeout);
|
||
|
||
try {
|
||
const shuffledServices = shuffleServices();
|
||
let lastError: Error | null = null;
|
||
|
||
for (const service of shuffledServices) {
|
||
console.log(`尝试IP检测服务: ${service.url}`);
|
||
|
||
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
||
let timeoutId: ReturnType<typeof setTimeout> | null = null;
|
||
|
||
try {
|
||
const timeoutController = new AbortController();
|
||
timeoutId = setTimeout(() => {
|
||
timeoutController.abort();
|
||
}, service.timeout || serviceTimeout);
|
||
|
||
const response = await axios.get(service.url, {
|
||
signal: timeoutController.signal,
|
||
timeout: service.timeout || serviceTimeout,
|
||
// 移除了headers参数(默认会使用axios的默认User-Agent)
|
||
});
|
||
|
||
if (timeoutId) clearTimeout(timeoutId);
|
||
|
||
if (response.data && response.data.ip) {
|
||
console.log(`IP检测成功,使用服务: ${service.url}`);
|
||
return service.mapping(response.data);
|
||
} else {
|
||
throw new Error(`无效的响应格式 from ${service.url}`);
|
||
}
|
||
} catch (error: any) {
|
||
if (timeoutId) clearTimeout(timeoutId);
|
||
|
||
lastError = error;
|
||
console.log(
|
||
`尝试 ${attempt + 1}/${maxRetries} 失败 (${service.url}):`,
|
||
error.message,
|
||
);
|
||
|
||
if (error.name === "AbortError") {
|
||
throw error;
|
||
}
|
||
|
||
if (attempt < maxRetries - 1) {
|
||
await new Promise((resolve) => setTimeout(resolve, 1000));
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
if (lastError) {
|
||
throw new Error(`所有IP检测服务都失败: ${lastError.message}`);
|
||
} else {
|
||
throw new Error("没有可用的IP检测服务");
|
||
}
|
||
} finally {
|
||
clearTimeout(overallTimeoutId);
|
||
}
|
||
};
|