Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ impl ApiConfig {
/// 判断是否是 88code 系列中转站
/// 88code 使用特定的 API 格式(POST + ResponseDTO 包装)
pub fn is_88code(&self) -> bool {
self.usage_url.contains("88code.org")
|| self.usage_url.contains("88code.ai")
self.usage_url.contains("88code")
|| self.usage_url.contains("rainapp.top")
}

Expand Down Expand Up @@ -506,7 +505,19 @@ pub fn get_usage_url_from_claude_settings() -> Option<String> {
Some("https://www.packyapi.com/api/usage/token/".to_string())
} else if base_url.contains("88code") {
// 88code 中转站:只要 URL 包含 "88code" 就识别
Some("https://www.88code.ai/api/usage".to_string())
// 保持原域名,因为不同的 88code 镜像站可能有不同的域名
let base = base_url.trim_end_matches('/');
// 如果已经以 /api 结尾,直接加 /usage
// 如果以 /v1 结尾,替换为 /api/usage
if base.ends_with("/api") {
Some(format!("{}/usage", base))
} else if base.ends_with("/v1") {
let base = base.trim_end_matches("/v1");
Some(format!("{}/api/usage", base))
} else {
// 没有后缀,添加 /api/usage
Some(format!("{}/api/usage", base))
}
} else {
// 其他中转站:基于 base_url 构造 usage URL
// 假设 API 路径为 /api/usage/token/(与 Packy 兼容)
Expand Down
13 changes: 11 additions & 2 deletions src/core/segments/byebyecode_subscription.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,25 @@ pub fn collect(config: &Config, input: &InputData) -> Option<SegmentData> {
// 实时获取数据,不使用缓存
// 传入 model 参数以获取正确的套餐信息
let model_id = &input.model.id;
let subscriptions = fetch_subscriptions_sync(&api_key, Some(model_id))?;
let subscriptions = fetch_subscriptions_sync(&api_key, &usage_url, Some(model_id))?;

fn fetch_subscriptions_sync(
api_key: &str,
usage_url: &str,
model: Option<&str>,
) -> Option<Vec<crate::api::SubscriptionData>> {
// 根据 usage_url 自动推断 subscription_url
let subscription_url = if usage_url.contains("88code") {
usage_url.replace("/usage", "/subscription")
} else {
"https://www.88code.ai/api/subscription".to_string()
};

let api_config = ApiConfig {
enabled: true,
api_key: api_key.to_string(),
..Default::default()
usage_url: usage_url.to_string(),
subscription_url,
};

let client = ApiClient::new(api_config).ok()?;
Expand Down
12 changes: 9 additions & 3 deletions src/core/segments/byebyecode_usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ pub fn collect(config: &Config, input: &InputData) -> Option<SegmentData> {
.unwrap_or_else(|| "https://www.88code.ai/api/usage".to_string());

// 根据 usage_url 判断是哪个服务,并设置动态图标
let service_name = if usage_url.contains("88code.org")
|| usage_url.contains("88code.ai")
let service_name = if usage_url.contains("88code")
|| usage_url.contains("rainapp.top")
{
"88code"
Expand Down Expand Up @@ -87,7 +86,14 @@ pub fn collect(config: &Config, input: &InputData) -> Option<SegmentData> {
.get("subscription_url")
.and_then(|v| v.as_str())
.map(|s| s.to_string())
.unwrap_or_else(|| "https://www.88code.ai/api/subscription".to_string());
.unwrap_or_else(|| {
// 根据 usage_url 自动推断 subscription_url
if usage_url.contains("88code") {
usage_url.replace("/usage", "/subscription")
} else {
"https://www.88code.ai/api/subscription".to_string()
}
});

// 从输入数据获取当前使用的模型
let model_id = &input.model.id;
Expand Down