From 9f0ba79ce2ade79697192e38ed5eb55dbc4ad289 Mon Sep 17 00:00:00 2001 From: coso Date: Tue, 24 Feb 2026 16:08:40 +0800 Subject: [PATCH] chore: bump proxycast to 0.70.1 and upgrade aster-rust v0.14.5 --- package.json | 2 +- src-tauri/Cargo.lock | 77 +++++++++++--------------- src-tauri/Cargo.toml | 10 ++-- src-tauri/crates/core/src/app_utils.rs | 24 ++++---- src-tauri/crates/core/src/logger.rs | 8 +-- 5 files changed, 53 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index c07f62d96..61f94bbd1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "proxycast", "private": true, - "version": "0.70.0", + "version": "0.70.1", "type": "module", "repository": { "type": "git", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e6ba0d553..1304528d8 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -212,8 +212,8 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "aster-core" -version = "0.13.0" -source = "git+https://github.com/astercloud/aster-rust?tag=v0.13.0#4422f761c3701d2e3af1b0e6db5d4394f80d9c54" +version = "0.14.5" +source = "git+https://github.com/astercloud/aster-rust?tag=v0.14.5#a77d13ee1275989abcdff045622d9f8458c3b840" dependencies = [ "ahash", "anyhow", @@ -305,8 +305,8 @@ dependencies = [ [[package]] name = "aster-models" -version = "0.13.0" -source = "git+https://github.com/astercloud/aster-rust?tag=v0.13.0#4422f761c3701d2e3af1b0e6db5d4394f80d9c54" +version = "0.14.5" +source = "git+https://github.com/astercloud/aster-rust?tag=v0.14.5#a77d13ee1275989abcdff045622d9f8458c3b840" dependencies = [ "serde", "serde_json", @@ -2211,7 +2211,7 @@ dependencies = [ "dtoa-short", "itoa", "matches", - "phf 0.10.1", + "phf 0.8.0", "proc-macro2", "quote", "smallvec", @@ -2227,7 +2227,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.3", + "phf 0.8.0", "smallvec", ] @@ -4070,7 +4070,7 @@ dependencies = [ "tokio", "tower-service", "tracing", - "windows-registry 0.6.1", + "windows-registry", ] [[package]] @@ -4085,7 +4085,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core 0.56.0", ] [[package]] @@ -5422,7 +5422,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ - "proc-macro-crate 3.4.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.114", @@ -6145,7 +6145,9 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ + "phf_macros 0.8.0", "phf_shared 0.8.0", + "proc-macro-hack", ] [[package]] @@ -6154,9 +6156,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", ] [[package]] @@ -6260,12 +6260,12 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "phf_generator 0.8.0", + "phf_shared 0.8.0", "proc-macro-hack", "proc-macro2", "quote", @@ -6677,7 +6677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.114", @@ -6685,7 +6685,7 @@ dependencies = [ [[package]] name = "proxycast" -version = "0.70.0" +version = "0.70.1" dependencies = [ "anyhow", "arboard", @@ -6785,7 +6785,7 @@ dependencies = [ [[package]] name = "proxycast-agent" -version = "0.70.0" +version = "0.70.1" dependencies = [ "aster-core", "async-trait", @@ -6808,7 +6808,7 @@ dependencies = [ [[package]] name = "proxycast-config" -version = "0.70.0" +version = "0.70.1" dependencies = [ "async-trait", "parking_lot", @@ -6824,7 +6824,7 @@ dependencies = [ [[package]] name = "proxycast-core" -version = "0.70.0" +version = "0.70.1" dependencies = [ "aster-models", "async-trait", @@ -6864,7 +6864,7 @@ dependencies = [ [[package]] name = "proxycast-credential" -version = "0.70.0" +version = "0.70.1" dependencies = [ "axum 0.7.9", "base64 0.22.1", @@ -6899,7 +6899,7 @@ dependencies = [ [[package]] name = "proxycast-infra" -version = "0.70.0" +version = "0.70.1" dependencies = [ "chrono", "dashmap 5.5.3", @@ -6919,7 +6919,7 @@ dependencies = [ [[package]] name = "proxycast-mcp" -version = "0.70.0" +version = "0.70.1" dependencies = [ "async-trait", "glob", @@ -6950,7 +6950,7 @@ dependencies = [ [[package]] name = "proxycast-processor" -version = "0.70.0" +version = "0.70.1" dependencies = [ "async-trait", "parking_lot", @@ -6969,7 +6969,7 @@ dependencies = [ [[package]] name = "proxycast-providers" -version = "0.70.0" +version = "0.70.1" dependencies = [ "anyhow", "async-stream", @@ -7021,7 +7021,7 @@ dependencies = [ [[package]] name = "proxycast-server" -version = "0.70.0" +version = "0.70.1" dependencies = [ "async-stream", "axum 0.7.9", @@ -7063,7 +7063,7 @@ dependencies = [ [[package]] name = "proxycast-server-utils" -version = "0.70.0" +version = "0.70.1" dependencies = [ "axum 0.7.9", "futures", @@ -7078,7 +7078,7 @@ dependencies = [ [[package]] name = "proxycast-services" -version = "0.70.0" +version = "0.70.1" dependencies = [ "anyhow", "aster-core", @@ -7119,7 +7119,7 @@ dependencies = [ [[package]] name = "proxycast-skills" -version = "0.70.0" +version = "0.70.1" dependencies = [ "async-trait", "dirs 5.0.1", @@ -7135,7 +7135,7 @@ dependencies = [ [[package]] name = "proxycast-terminal" -version = "0.70.0" +version = "0.70.1" dependencies = [ "async-trait", "base64 0.22.1", @@ -7162,7 +7162,7 @@ dependencies = [ [[package]] name = "proxycast-websocket" -version = "0.70.0" +version = "0.70.1" dependencies = [ "axum 0.7.9", "chrono", @@ -8514,7 +8514,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" dependencies = [ - "dirs 6.0.0", + "dirs 4.0.0", ] [[package]] @@ -9388,7 +9388,7 @@ dependencies = [ "thiserror 2.0.18", "tracing", "url", - "windows-registry 0.5.3", + "windows-registry", "windows-result 0.3.4", ] @@ -11272,17 +11272,6 @@ dependencies = [ "windows-strings 0.4.2", ] -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - [[package]] name = "windows-result" version = "0.1.2" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index be6d41f5c..cb7e481fd 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ members = ["crates/*"] resolver = "2" [workspace.package] -version = "0.70.0" +version = "0.70.1" edition = "2021" authors = ["coso"] repository = "https://github.com/aiclientproxy/proxycast" @@ -122,11 +122,11 @@ enigo = "0.3" # Aster Agent Framework # 开发时使用本地 aster-rust，CI/CD 使用远程 GitHub 仓库 # 本地开发: path = "../../../astercloud/aster-rust/crates/aster" (相对 src-tauri/) -# CI/CD: git = "https://github.com/astercloud/aster-rust", tag = "v0.13.0" +# CI/CD: git = "https://github.com/astercloud/aster-rust", tag = "v0.14.5" # aster = { package = "aster-core", path = "../../../astercloud/aster-rust/crates/aster" } -aster = { package = "aster-core", git = "https://github.com/astercloud/aster-rust", tag = "v0.13.0" } +aster = { package = "aster-core", git = "https://github.com/astercloud/aster-rust", tag = "v0.14.5" } # 本地开发: aster-models = { path = "../../../astercloud/aster-rust/crates/aster-models" } -aster-models = { git = "https://github.com/astercloud/aster-rust", tag = "v0.13.0" } +aster-models = { git = "https://github.com/astercloud/aster-rust", tag = "v0.14.5" } # MCP (Model Context Protocol) rmcp = { version = "0.12.0", features = ["client", "transport-io", "transport-child-process"] } @@ -189,7 +189,7 @@ version = "2.4" [package] name = "proxycast" -version = "0.70.0" +version = "0.70.1" description = "AI API Proxy Desktop App" authors = ["you"] edition = "2021" diff --git a/src-tauri/crates/core/src/app_utils.rs b/src-tauri/crates/core/src/app_utils.rs index a11f4552c..bc7a996e0 100644 --- a/src-tauri/crates/core/src/app_utils.rs +++ b/src-tauri/crates/core/src/app_utils.rs @@ -31,13 +31,11 @@ pub fn is_valid_bind_host(host: &str) -> bool { return true; } - if let Ok(address) = host.parse::() { - if let std::net::IpAddr::V4(ipv4) = address { - let octets = ipv4.octets(); - return octets[0] == 10 - || (octets[0] == 172 && (octets[1] >= 16 && octets[1] <= 31)) - || (octets[0] == 192 && octets[1] == 168); - } + if let Ok(std::net::IpAddr::V4(ipv4)) = host.parse::() { + let octets = ipv4.octets(); + return octets[0] == 10 + || (octets[0] == 172 && (octets[1] >= 16 && octets[1] <= 31)) + || (octets[0] == 192 && octets[1] == 168); } false @@ -49,13 +47,11 @@ pub fn is_non_local_bind(host: &str) -> bool { return true; } - if let Ok(address) = host.parse::() { - if let std::net::IpAddr::V4(ipv4) = address { - let octets = ipv4.octets(); - return octets[0] == 10 - || (octets[0] == 172 && (octets[1] >= 16 && octets[1] <= 31)) - || (octets[0] == 192 && octets[1] == 168); - } + if let Ok(std::net::IpAddr::V4(ipv4)) = host.parse::() { + let octets = ipv4.octets(); + return octets[0] == 10 + || (octets[0] == 172 && (octets[1] >= 16 && octets[1] <= 31)) + || (octets[0] == 192 && octets[1] == 168); } false diff --git a/src-tauri/crates/core/src/logger.rs b/src-tauri/crates/core/src/logger.rs index 8d607ac68..a180acd0c 100644 --- a/src-tauri/crates/core/src/logger.rs +++ b/src-tauri/crates/core/src/logger.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; use std::collections::VecDeque; use std::fs::{self, OpenOptions}; use std::io::{Read, Write}; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; #[derive(Debug, Clone)] @@ -130,7 +130,7 @@ impl LogStore { .map(|p| p.to_string_lossy().to_string()) } - fn rotate_log_file_if_needed(&self, path: &PathBuf) { + fn rotate_log_file_if_needed(&self, path: &Path) { let Ok(metadata) = fs::metadata(path) else { return; }; @@ -147,7 +147,7 @@ impl LogStore { self.prune_old_logs(path); } - fn prune_old_logs(&self, path: &PathBuf) { + fn prune_old_logs(&self, path: &Path) { let Some(dir) = path.parent() else { return }; self.archive_old_logs(path); let Ok(entries) = fs::read_dir(dir) else { @@ -177,7 +177,7 @@ impl LogStore { } } - fn archive_old_logs(&self, path: &PathBuf) { + fn archive_old_logs(&self, path: &Path) { let Some(dir) = path.parent() else { return }; let Ok(entries) = fs::read_dir(dir) else { return;