mirror of
https://github.com/router-for-me/Cli-Proxy-API-Management-Center.git
synced 2026-02-03 03:10:50 +08:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df472119e7 | ||
|
|
10f2262753 | ||
|
|
39d86d133a | ||
|
|
ddbd7d00bd |
58
.github/workflows/release.yml
vendored
58
.github/workflows/release.yml
vendored
@@ -15,6 +15,9 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
fetch-tags: true
|
||||||
|
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
@@ -36,27 +39,48 @@ jobs:
|
|||||||
mv index.html management.html
|
mv index.html management.html
|
||||||
ls -lh management.html
|
ls -lh management.html
|
||||||
|
|
||||||
|
- name: Generate release notes
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
current_tag="${GITHUB_REF_NAME}"
|
||||||
|
previous_tag="$(git tag --list 'v*' --sort=-v:refname | grep -v "^${current_tag}$" | head -n 1 || true)"
|
||||||
|
if [ -n "${previous_tag}" ]; then
|
||||||
|
range="${previous_tag}..${current_tag}"
|
||||||
|
title="Changes since ${previous_tag}"
|
||||||
|
else
|
||||||
|
range="${current_tag}"
|
||||||
|
title="Changes"
|
||||||
|
fi
|
||||||
|
|
||||||
|
{
|
||||||
|
echo "## CLI Proxy API Management Center - ${current_tag}"
|
||||||
|
echo
|
||||||
|
echo "### Download and Usage"
|
||||||
|
echo "1. Download the \`management.html\` file"
|
||||||
|
echo "2. Open it directly in your browser"
|
||||||
|
echo "3. All assets (CSS, JavaScript, images) are bundled into this single file"
|
||||||
|
echo
|
||||||
|
echo "### Features"
|
||||||
|
echo "- Single file, no external dependencies required"
|
||||||
|
echo "- Complete management interface for CLI Proxy API"
|
||||||
|
echo "- Support for local and remote connections"
|
||||||
|
echo "- Multi-language support (Chinese/English)"
|
||||||
|
echo "- Dark/Light theme support"
|
||||||
|
echo
|
||||||
|
echo "### ${title}"
|
||||||
|
echo
|
||||||
|
git log --pretty=format:"- %h %s" "${range}"
|
||||||
|
echo
|
||||||
|
echo
|
||||||
|
echo "---"
|
||||||
|
echo "🤖 Generated with GitHub Actions"
|
||||||
|
} > release-notes.md
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
files: dist/management.html
|
files: dist/management.html
|
||||||
body: |
|
body_path: release-notes.md
|
||||||
## CLI Proxy API Management Center - ${{ github.ref_name }}
|
|
||||||
|
|
||||||
### Download and Usage
|
|
||||||
1. Download the `management.html` file
|
|
||||||
2. Open it directly in your browser
|
|
||||||
3. All assets (CSS, JavaScript, images) are bundled into this single file
|
|
||||||
|
|
||||||
### Features
|
|
||||||
- Single file, no external dependencies required
|
|
||||||
- Complete management interface for CLI Proxy API
|
|
||||||
- Support for local and remote connections
|
|
||||||
- Multi-language support (Chinese/English)
|
|
||||||
- Dark/Light theme support
|
|
||||||
|
|
||||||
---
|
|
||||||
🤖 Generated with GitHub Actions
|
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
export function LoadingSpinner({ size = 20 }: { size?: number }) {
|
export function LoadingSpinner({
|
||||||
|
size = 20,
|
||||||
|
className = ''
|
||||||
|
}: {
|
||||||
|
size?: number;
|
||||||
|
className?: string;
|
||||||
|
}) {
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="loading-spinner"
|
className={`loading-spinner${className ? ` ${className}` : ''}`}
|
||||||
style={{ width: size, height: size, borderWidth: size / 7 }}
|
style={{ width: size, height: size, borderWidth: size / 7 }}
|
||||||
role="status"
|
role="status"
|
||||||
aria-live="polite"
|
aria-live="polite"
|
||||||
|
|||||||
@@ -424,9 +424,10 @@
|
|||||||
"gemini_cli_oauth_title": "Gemini CLI OAuth",
|
"gemini_cli_oauth_title": "Gemini CLI OAuth",
|
||||||
"gemini_cli_oauth_button": "Start Gemini CLI Login",
|
"gemini_cli_oauth_button": "Start Gemini CLI Login",
|
||||||
"gemini_cli_oauth_hint": "Login to Google Gemini CLI service through OAuth flow, automatically obtain and save authentication files.",
|
"gemini_cli_oauth_hint": "Login to Google Gemini CLI service through OAuth flow, automatically obtain and save authentication files.",
|
||||||
"gemini_cli_project_id_label": "Google Cloud Project ID (Optional):",
|
"gemini_cli_project_id_label": "Google Cloud Project ID:",
|
||||||
"gemini_cli_project_id_placeholder": "Enter Google Cloud Project ID (optional)",
|
"gemini_cli_project_id_placeholder": "Enter Google Cloud Project ID",
|
||||||
"gemini_cli_project_id_hint": "If a project ID is specified, authentication information for that project will be used.",
|
"gemini_cli_project_id_hint": "Project ID is required for Gemini CLI OAuth.",
|
||||||
|
"gemini_cli_project_id_required": "Please enter a Google Cloud project ID.",
|
||||||
"gemini_cli_oauth_url_label": "Authorization URL:",
|
"gemini_cli_oauth_url_label": "Authorization URL:",
|
||||||
"gemini_cli_open_link": "Open Link",
|
"gemini_cli_open_link": "Open Link",
|
||||||
"gemini_cli_copy_link": "Copy Link",
|
"gemini_cli_copy_link": "Copy Link",
|
||||||
@@ -446,6 +447,16 @@
|
|||||||
"qwen_oauth_status_error": "Authentication failed:",
|
"qwen_oauth_status_error": "Authentication failed:",
|
||||||
"qwen_oauth_start_error": "Failed to start Qwen OAuth:",
|
"qwen_oauth_start_error": "Failed to start Qwen OAuth:",
|
||||||
"qwen_oauth_polling_error": "Failed to check authentication status:",
|
"qwen_oauth_polling_error": "Failed to check authentication status:",
|
||||||
|
"oauth_callback_label": "Callback URL",
|
||||||
|
"oauth_callback_placeholder": "http://localhost:1455/auth/callback?code=...&state=...",
|
||||||
|
"oauth_callback_hint": "Remote browser mode: after the provider redirects to http://localhost:..., copy the full URL and submit it here.",
|
||||||
|
"oauth_callback_button": "Submit Callback URL",
|
||||||
|
"oauth_callback_required": "Please paste the full redirect URL first.",
|
||||||
|
"oauth_callback_success": "Callback URL submitted. Continue waiting for authentication.",
|
||||||
|
"oauth_callback_error": "Failed to submit callback URL:",
|
||||||
|
"oauth_callback_upgrade_hint": "Please update CLI Proxy API or check the connection.",
|
||||||
|
"oauth_callback_status_success": "Callback URL submitted, waiting for authentication...",
|
||||||
|
"oauth_callback_status_error": "Callback URL submission failed:",
|
||||||
"missing_state": "Unable to retrieve authentication state parameter",
|
"missing_state": "Unable to retrieve authentication state parameter",
|
||||||
"iflow_oauth_title": "iFlow OAuth",
|
"iflow_oauth_title": "iFlow OAuth",
|
||||||
"iflow_oauth_button": "Start iFlow Login",
|
"iflow_oauth_button": "Start iFlow Login",
|
||||||
|
|||||||
@@ -424,9 +424,10 @@
|
|||||||
"gemini_cli_oauth_title": "Gemini CLI OAuth",
|
"gemini_cli_oauth_title": "Gemini CLI OAuth",
|
||||||
"gemini_cli_oauth_button": "开始 Gemini CLI 登录",
|
"gemini_cli_oauth_button": "开始 Gemini CLI 登录",
|
||||||
"gemini_cli_oauth_hint": "通过 OAuth 流程登录 Google Gemini CLI 服务,自动获取并保存认证文件。",
|
"gemini_cli_oauth_hint": "通过 OAuth 流程登录 Google Gemini CLI 服务,自动获取并保存认证文件。",
|
||||||
"gemini_cli_project_id_label": "Google Cloud 项目 ID (可选):",
|
"gemini_cli_project_id_label": "Google Cloud 项目 ID:",
|
||||||
"gemini_cli_project_id_placeholder": "输入 Google Cloud 项目 ID (可选)",
|
"gemini_cli_project_id_placeholder": "输入 Google Cloud 项目 ID",
|
||||||
"gemini_cli_project_id_hint": "如果指定了项目 ID,将使用该项目的认证信息。",
|
"gemini_cli_project_id_hint": "请填写项目 ID,用于 Gemini CLI OAuth 登录。",
|
||||||
|
"gemini_cli_project_id_required": "请填写 Google Cloud 项目 ID。",
|
||||||
"gemini_cli_oauth_url_label": "授权链接:",
|
"gemini_cli_oauth_url_label": "授权链接:",
|
||||||
"gemini_cli_open_link": "打开链接",
|
"gemini_cli_open_link": "打开链接",
|
||||||
"gemini_cli_copy_link": "复制链接",
|
"gemini_cli_copy_link": "复制链接",
|
||||||
@@ -446,6 +447,16 @@
|
|||||||
"qwen_oauth_status_error": "认证失败:",
|
"qwen_oauth_status_error": "认证失败:",
|
||||||
"qwen_oauth_start_error": "启动 Qwen OAuth 失败:",
|
"qwen_oauth_start_error": "启动 Qwen OAuth 失败:",
|
||||||
"qwen_oauth_polling_error": "检查认证状态失败:",
|
"qwen_oauth_polling_error": "检查认证状态失败:",
|
||||||
|
"oauth_callback_label": "回调 URL",
|
||||||
|
"oauth_callback_placeholder": "http://localhost:1455/auth/callback?code=...&state=...",
|
||||||
|
"oauth_callback_hint": "远程浏览器模式:当授权跳转到 http://localhost:... 后,复制完整 URL 并提交到这里。",
|
||||||
|
"oauth_callback_button": "提交回调 URL",
|
||||||
|
"oauth_callback_required": "请先粘贴完整的回调 URL。",
|
||||||
|
"oauth_callback_success": "回调 URL 已提交,请继续等待认证。",
|
||||||
|
"oauth_callback_error": "提交回调 URL 失败:",
|
||||||
|
"oauth_callback_upgrade_hint": "请更新CLI Proxy API或检查连接",
|
||||||
|
"oauth_callback_status_success": "回调 URL 已提交,等待认证中...",
|
||||||
|
"oauth_callback_status_error": "回调 URL 提交失败:",
|
||||||
"missing_state": "无法获取认证状态参数",
|
"missing_state": "无法获取认证状态参数",
|
||||||
"iflow_oauth_title": "iFlow OAuth",
|
"iflow_oauth_title": "iFlow OAuth",
|
||||||
"iflow_oauth_button": "开始 iFlow 登录",
|
"iflow_oauth_button": "开始 iFlow 登录",
|
||||||
|
|||||||
@@ -404,8 +404,17 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.excludedModelTag {
|
.excludedModelTag {
|
||||||
background: rgba(251, 191, 36, 0.2);
|
background: rgba(251, 191, 36, 0.22);
|
||||||
border-color: rgba(251, 191, 36, 0.4);
|
border-color: rgba(251, 191, 36, 0.55);
|
||||||
|
color: #fde68a;
|
||||||
|
|
||||||
|
.modelName {
|
||||||
|
color: #fde68a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.excludedModelsLabel {
|
||||||
|
color: #fde68a;
|
||||||
}
|
}
|
||||||
|
|
||||||
.apiKeyEntryCard {
|
.apiKeyEntryCard {
|
||||||
|
|||||||
@@ -1897,6 +1897,7 @@ export function AiProvidersPage() {
|
|||||||
keyPlaceholder={t('common.custom_headers_key_placeholder')}
|
keyPlaceholder={t('common.custom_headers_key_placeholder')}
|
||||||
valuePlaceholder={t('common.custom_headers_value_placeholder')}
|
valuePlaceholder={t('common.custom_headers_value_placeholder')}
|
||||||
/>
|
/>
|
||||||
|
{modal?.type === 'claude' && (
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label>{t('ai_providers.claude_models_label')}</label>
|
<label>{t('ai_providers.claude_models_label')}</label>
|
||||||
<ModelInputList
|
<ModelInputList
|
||||||
@@ -1910,6 +1911,7 @@ export function AiProvidersPage() {
|
|||||||
disabled={saving}
|
disabled={saving}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label>{t('ai_providers.excluded_models_label')}</label>
|
<label>{t('ai_providers.excluded_models_label')}</label>
|
||||||
<textarea
|
<textarea
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ const LOG_LATENCY_REGEX = /\b(\d+(?:\.\d+)?)(?:\s*)(µs|us|ms|s)\b/i;
|
|||||||
const LOG_IPV4_REGEX = /\b(?:\d{1,3}\.){3}\d{1,3}\b/;
|
const LOG_IPV4_REGEX = /\b(?:\d{1,3}\.){3}\d{1,3}\b/;
|
||||||
const LOG_IPV6_REGEX = /\b(?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}\b/i;
|
const LOG_IPV6_REGEX = /\b(?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}\b/i;
|
||||||
const LOG_TIME_OF_DAY_REGEX = /^\d{1,2}:\d{2}:\d{2}(?:\.\d{1,3})?$/;
|
const LOG_TIME_OF_DAY_REGEX = /^\d{1,2}:\d{2}:\d{2}(?:\.\d{1,3})?$/;
|
||||||
|
const GIN_TIMESTAMP_SEGMENT_REGEX =
|
||||||
|
/^\[GIN\]\s+(\d{4})\/(\d{2})\/(\d{2})\s*-\s*(\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?)\s*$/;
|
||||||
|
|
||||||
const HTTP_STATUS_PATTERNS: RegExp[] = [
|
const HTTP_STATUS_PATTERNS: RegExp[] = [
|
||||||
/\|\s*([1-5]\d{2})\s*\|/,
|
/\|\s*([1-5]\d{2})\s*\|/,
|
||||||
@@ -88,6 +90,13 @@ const extractIp = (text: string): string | undefined => {
|
|||||||
return candidate;
|
return candidate;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const normalizeTimestampToSeconds = (value: string): string => {
|
||||||
|
const trimmed = value.trim();
|
||||||
|
const match = trimmed.match(/^(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}:\d{2})/);
|
||||||
|
if (!match) return trimmed;
|
||||||
|
return `${match[1]} ${match[2]}`;
|
||||||
|
};
|
||||||
|
|
||||||
type ParsedLogLine = {
|
type ParsedLogLine = {
|
||||||
raw: string;
|
raw: string;
|
||||||
timestamp?: string;
|
timestamp?: string;
|
||||||
@@ -173,6 +182,23 @@ const parseLogLine = (raw: string): ParsedLogLine => {
|
|||||||
.filter(Boolean);
|
.filter(Boolean);
|
||||||
const consumed = new Set<number>();
|
const consumed = new Set<number>();
|
||||||
|
|
||||||
|
const ginIndex = segments.findIndex((segment) => GIN_TIMESTAMP_SEGMENT_REGEX.test(segment));
|
||||||
|
if (ginIndex >= 0) {
|
||||||
|
const match = segments[ginIndex].match(GIN_TIMESTAMP_SEGMENT_REGEX);
|
||||||
|
if (match) {
|
||||||
|
const ginTimestamp = `${match[1]}-${match[2]}-${match[3]} ${match[4]}`;
|
||||||
|
const normalizedGin = normalizeTimestampToSeconds(ginTimestamp);
|
||||||
|
const normalizedParsed = timestamp ? normalizeTimestampToSeconds(timestamp) : undefined;
|
||||||
|
|
||||||
|
if (!timestamp) {
|
||||||
|
timestamp = ginTimestamp;
|
||||||
|
consumed.add(ginIndex);
|
||||||
|
} else if (normalizedParsed === normalizedGin) {
|
||||||
|
consumed.add(ginIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// status code
|
// status code
|
||||||
const statusIndex = segments.findIndex((segment) => /^\d{3}\b/.test(segment));
|
const statusIndex = segments.findIndex((segment) => /^\d{3}\b/.test(segment));
|
||||||
if (statusIndex >= 0) {
|
if (statusIndex >= 0) {
|
||||||
@@ -234,6 +260,17 @@ const parseLogLine = (raw: string): ParsedLogLine => {
|
|||||||
|
|
||||||
if (!level) level = inferLogLevel(raw);
|
if (!level) level = inferLogLevel(raw);
|
||||||
|
|
||||||
|
if (message) {
|
||||||
|
const match = message.match(GIN_TIMESTAMP_SEGMENT_REGEX);
|
||||||
|
if (match) {
|
||||||
|
const ginTimestamp = `${match[1]}-${match[2]}-${match[3]} ${match[4]}`;
|
||||||
|
if (!timestamp) timestamp = ginTimestamp;
|
||||||
|
if (normalizeTimestampToSeconds(timestamp) === normalizeTimestampToSeconds(ginTimestamp)) {
|
||||||
|
message = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
raw,
|
raw,
|
||||||
timestamp,
|
timestamp,
|
||||||
|
|||||||
@@ -59,3 +59,47 @@
|
|||||||
color: #3b82f6;
|
color: #3b82f6;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.callbackSection {
|
||||||
|
margin-top: $spacing-md;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: $spacing-xs;
|
||||||
|
}
|
||||||
|
|
||||||
|
.callbackActions {
|
||||||
|
display: flex;
|
||||||
|
gap: $spacing-md;
|
||||||
|
}
|
||||||
|
|
||||||
|
.authUrlBox {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border: 1px dashed var(--border-color);
|
||||||
|
border-radius: $radius-md;
|
||||||
|
padding: $spacing-md;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: $spacing-xs;
|
||||||
|
}
|
||||||
|
|
||||||
|
.authUrlLabel {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.authUrlValue {
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-primary);
|
||||||
|
word-break: break-all;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
line-height: 1.5;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.authUrlActions {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: $spacing-sm;
|
||||||
|
margin-top: $spacing-sm;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import { useEffect, useRef, useState, useMemo } from 'react';
|
import { useEffect, useRef, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Card } from '@/components/ui/Card';
|
import { Card } from '@/components/ui/Card';
|
||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
import { Input } from '@/components/ui/Input';
|
import { Input } from '@/components/ui/Input';
|
||||||
import { useNotificationStore } from '@/stores';
|
import { useNotificationStore } from '@/stores';
|
||||||
import { oauthApi, type OAuthProvider, type IFlowCookieAuthResponse } from '@/services/api/oauth';
|
import { oauthApi, type OAuthProvider, type IFlowCookieAuthResponse } from '@/services/api/oauth';
|
||||||
import { isLocalhost } from '@/utils/connection';
|
|
||||||
import styles from './OAuthPage.module.scss';
|
import styles from './OAuthPage.module.scss';
|
||||||
|
|
||||||
interface ProviderState {
|
interface ProviderState {
|
||||||
@@ -14,6 +13,12 @@ interface ProviderState {
|
|||||||
status?: 'idle' | 'waiting' | 'success' | 'error';
|
status?: 'idle' | 'waiting' | 'success' | 'error';
|
||||||
error?: string;
|
error?: string;
|
||||||
polling?: boolean;
|
polling?: boolean;
|
||||||
|
projectId?: string;
|
||||||
|
projectIdError?: string;
|
||||||
|
callbackUrl?: string;
|
||||||
|
callbackSubmitting?: boolean;
|
||||||
|
callbackStatus?: 'success' | 'error';
|
||||||
|
callbackError?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface IFlowCookieState {
|
interface IFlowCookieState {
|
||||||
@@ -33,6 +38,8 @@ const PROVIDERS: { id: OAuthProvider; titleKey: string; hintKey: string; urlLabe
|
|||||||
{ id: 'iflow', titleKey: 'auth_login.iflow_oauth_title', hintKey: 'auth_login.iflow_oauth_hint', urlLabelKey: 'auth_login.iflow_oauth_url_label' }
|
{ id: 'iflow', titleKey: 'auth_login.iflow_oauth_title', hintKey: 'auth_login.iflow_oauth_hint', urlLabelKey: 'auth_login.iflow_oauth_url_label' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const CALLBACK_SUPPORTED: OAuthProvider[] = ['codex', 'anthropic', 'antigravity', 'gemini-cli', 'iflow'];
|
||||||
|
|
||||||
export function OAuthPage() {
|
export function OAuthPage() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { showNotification } = useNotificationStore();
|
const { showNotification } = useNotificationStore();
|
||||||
@@ -40,15 +47,19 @@ export function OAuthPage() {
|
|||||||
const [iflowCookie, setIflowCookie] = useState<IFlowCookieState>({ cookie: '', loading: false });
|
const [iflowCookie, setIflowCookie] = useState<IFlowCookieState>({ cookie: '', loading: false });
|
||||||
const timers = useRef<Record<string, number>>({});
|
const timers = useRef<Record<string, number>>({});
|
||||||
|
|
||||||
// 检测是否为本地访问
|
|
||||||
const isLocal = useMemo(() => isLocalhost(window.location.hostname), []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
return () => {
|
return () => {
|
||||||
Object.values(timers.current).forEach((timer) => window.clearInterval(timer));
|
Object.values(timers.current).forEach((timer) => window.clearInterval(timer));
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const updateProviderState = (provider: OAuthProvider, next: Partial<ProviderState>) => {
|
||||||
|
setStates((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[provider]: { ...(prev[provider] ?? {}), ...next }
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
const startPolling = (provider: OAuthProvider, state: string) => {
|
const startPolling = (provider: OAuthProvider, state: string) => {
|
||||||
if (timers.current[provider]) {
|
if (timers.current[provider]) {
|
||||||
clearInterval(timers.current[provider]);
|
clearInterval(timers.current[provider]);
|
||||||
@@ -57,27 +68,18 @@ export function OAuthPage() {
|
|||||||
try {
|
try {
|
||||||
const res = await oauthApi.getAuthStatus(state);
|
const res = await oauthApi.getAuthStatus(state);
|
||||||
if (res.status === 'ok') {
|
if (res.status === 'ok') {
|
||||||
setStates((prev) => ({
|
updateProviderState(provider, { status: 'success', polling: false });
|
||||||
...prev,
|
|
||||||
[provider]: { ...prev[provider], status: 'success', polling: false }
|
|
||||||
}));
|
|
||||||
showNotification(t('auth_login.codex_oauth_status_success'), 'success');
|
showNotification(t('auth_login.codex_oauth_status_success'), 'success');
|
||||||
window.clearInterval(timer);
|
window.clearInterval(timer);
|
||||||
delete timers.current[provider];
|
delete timers.current[provider];
|
||||||
} else if (res.status === 'error') {
|
} else if (res.status === 'error') {
|
||||||
setStates((prev) => ({
|
updateProviderState(provider, { status: 'error', error: res.error, polling: false });
|
||||||
...prev,
|
|
||||||
[provider]: { ...prev[provider], status: 'error', error: res.error, polling: false }
|
|
||||||
}));
|
|
||||||
showNotification(`${t('auth_login.codex_oauth_status_error')} ${res.error || ''}`, 'error');
|
showNotification(`${t('auth_login.codex_oauth_status_error')} ${res.error || ''}`, 'error');
|
||||||
window.clearInterval(timer);
|
window.clearInterval(timer);
|
||||||
delete timers.current[provider];
|
delete timers.current[provider];
|
||||||
}
|
}
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
setStates((prev) => ({
|
updateProviderState(provider, { status: 'error', error: err?.message, polling: false });
|
||||||
...prev,
|
|
||||||
[provider]: { ...prev[provider], status: 'error', error: err?.message, polling: false }
|
|
||||||
}));
|
|
||||||
window.clearInterval(timer);
|
window.clearInterval(timer);
|
||||||
delete timers.current[provider];
|
delete timers.current[provider];
|
||||||
}
|
}
|
||||||
@@ -86,24 +88,35 @@ export function OAuthPage() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const startAuth = async (provider: OAuthProvider) => {
|
const startAuth = async (provider: OAuthProvider) => {
|
||||||
setStates((prev) => ({
|
const projectId = provider === 'gemini-cli' ? (states[provider]?.projectId || '').trim() : undefined;
|
||||||
...prev,
|
if (provider === 'gemini-cli' && !projectId) {
|
||||||
[provider]: { ...prev[provider], status: 'waiting', polling: true, error: undefined }
|
const message = t('auth_login.gemini_cli_project_id_required');
|
||||||
}));
|
updateProviderState(provider, { projectIdError: message });
|
||||||
|
showNotification(message, 'warning');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (provider === 'gemini-cli') {
|
||||||
|
updateProviderState(provider, { projectIdError: undefined });
|
||||||
|
}
|
||||||
|
updateProviderState(provider, {
|
||||||
|
status: 'waiting',
|
||||||
|
polling: true,
|
||||||
|
error: undefined,
|
||||||
|
callbackStatus: undefined,
|
||||||
|
callbackError: undefined,
|
||||||
|
callbackUrl: ''
|
||||||
|
});
|
||||||
try {
|
try {
|
||||||
const res = await oauthApi.startAuth(provider);
|
const res = await oauthApi.startAuth(
|
||||||
setStates((prev) => ({
|
provider,
|
||||||
...prev,
|
provider === 'gemini-cli' ? { projectId: projectId! } : undefined
|
||||||
[provider]: { ...prev[provider], url: res.url, state: res.state, status: 'waiting', polling: true }
|
);
|
||||||
}));
|
updateProviderState(provider, { url: res.url, state: res.state, status: 'waiting', polling: true });
|
||||||
if (res.state) {
|
if (res.state) {
|
||||||
startPolling(provider, res.state);
|
startPolling(provider, res.state);
|
||||||
}
|
}
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
setStates((prev) => ({
|
updateProviderState(provider, { status: 'error', error: err?.message, polling: false });
|
||||||
...prev,
|
|
||||||
[provider]: { ...prev[provider], status: 'error', error: err?.message, polling: false }
|
|
||||||
}));
|
|
||||||
showNotification(`${t('auth_login.codex_oauth_start_error')} ${err?.message || ''}`, 'error');
|
showNotification(`${t('auth_login.codex_oauth_start_error')} ${err?.message || ''}`, 'error');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -118,6 +131,40 @@ export function OAuthPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const submitCallback = async (provider: OAuthProvider) => {
|
||||||
|
const redirectUrl = (states[provider]?.callbackUrl || '').trim();
|
||||||
|
if (!redirectUrl) {
|
||||||
|
showNotification(t('auth_login.oauth_callback_required'), 'warning');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
updateProviderState(provider, {
|
||||||
|
callbackSubmitting: true,
|
||||||
|
callbackStatus: undefined,
|
||||||
|
callbackError: undefined
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await oauthApi.submitCallback(provider, redirectUrl);
|
||||||
|
updateProviderState(provider, { callbackSubmitting: false, callbackStatus: 'success' });
|
||||||
|
showNotification(t('auth_login.oauth_callback_success'), 'success');
|
||||||
|
} catch (err: any) {
|
||||||
|
const errorMessage =
|
||||||
|
err?.status === 404
|
||||||
|
? t('auth_login.oauth_callback_upgrade_hint', {
|
||||||
|
defaultValue: 'Please update CLI Proxy API or check the connection.'
|
||||||
|
})
|
||||||
|
: err?.message;
|
||||||
|
updateProviderState(provider, {
|
||||||
|
callbackSubmitting: false,
|
||||||
|
callbackStatus: 'error',
|
||||||
|
callbackError: errorMessage
|
||||||
|
});
|
||||||
|
const notificationMessage = errorMessage
|
||||||
|
? `${t('auth_login.oauth_callback_error')} ${errorMessage}`
|
||||||
|
: t('auth_login.oauth_callback_error');
|
||||||
|
showNotification(notificationMessage, 'error');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const submitIflowCookie = async () => {
|
const submitIflowCookie = async () => {
|
||||||
const cookie = iflowCookie.cookie.trim();
|
const cookie = iflowCookie.cookie.trim();
|
||||||
if (!cookie) {
|
if (!cookie) {
|
||||||
@@ -164,36 +211,38 @@ export function OAuthPage() {
|
|||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
{PROVIDERS.map((provider) => {
|
{PROVIDERS.map((provider) => {
|
||||||
const state = states[provider.id] || {};
|
const state = states[provider.id] || {};
|
||||||
// 非本地访问时禁用所有 OAuth 登录方式
|
const canSubmitCallback = CALLBACK_SUPPORTED.includes(provider.id) && Boolean(state.url);
|
||||||
const isDisabled = !isLocal;
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div key={provider.id}>
|
||||||
key={provider.id}
|
|
||||||
style={isDisabled ? { opacity: 0.6, pointerEvents: 'none' } : undefined}
|
|
||||||
>
|
|
||||||
<Card
|
<Card
|
||||||
title={t(provider.titleKey)}
|
title={t(provider.titleKey)}
|
||||||
extra={
|
extra={
|
||||||
<Button
|
<Button onClick={() => startAuth(provider.id)} loading={state.polling}>
|
||||||
onClick={() => startAuth(provider.id)}
|
|
||||||
loading={state.polling}
|
|
||||||
disabled={isDisabled}
|
|
||||||
>
|
|
||||||
{t('common.login')}
|
{t('common.login')}
|
||||||
</Button>
|
</Button>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<div className="hint">{t(provider.hintKey)}</div>
|
<div className="hint">{t(provider.hintKey)}</div>
|
||||||
{isDisabled && (
|
{provider.id === 'gemini-cli' && (
|
||||||
<div className="status-badge warning" style={{ marginTop: 8 }}>
|
<Input
|
||||||
{t('auth_login.remote_access_disabled')}
|
label={t('auth_login.gemini_cli_project_id_label')}
|
||||||
</div>
|
hint={t('auth_login.gemini_cli_project_id_hint')}
|
||||||
|
value={state.projectId || ''}
|
||||||
|
error={state.projectIdError}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateProviderState(provider.id, {
|
||||||
|
projectId: e.target.value,
|
||||||
|
projectIdError: undefined
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder={t('auth_login.gemini_cli_project_id_placeholder')}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
{!isDisabled && state.url && (
|
{state.url && (
|
||||||
<div className="connection-box">
|
<div className={`connection-box ${styles.authUrlBox}`}>
|
||||||
<div className="label">{t(provider.urlLabelKey)}</div>
|
<div className={styles.authUrlLabel}>{t(provider.urlLabelKey)}</div>
|
||||||
<div className="value">{state.url}</div>
|
<div className={styles.authUrlValue}>{state.url}</div>
|
||||||
<div className="item-actions" style={{ marginTop: 8 }}>
|
<div className={styles.authUrlActions}>
|
||||||
<Button variant="secondary" size="sm" onClick={() => copyLink(state.url!)}>
|
<Button variant="secondary" size="sm" onClick={() => copyLink(state.url!)}>
|
||||||
{t('auth_login.codex_copy_link')}
|
{t('auth_login.codex_copy_link')}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -207,7 +256,44 @@ export function OAuthPage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{!isDisabled && state.status && state.status !== 'idle' && (
|
{canSubmitCallback && (
|
||||||
|
<div className={styles.callbackSection}>
|
||||||
|
<Input
|
||||||
|
label={t('auth_login.oauth_callback_label')}
|
||||||
|
hint={t('auth_login.oauth_callback_hint')}
|
||||||
|
value={state.callbackUrl || ''}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateProviderState(provider.id, {
|
||||||
|
callbackUrl: e.target.value,
|
||||||
|
callbackStatus: undefined,
|
||||||
|
callbackError: undefined
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder={t('auth_login.oauth_callback_placeholder')}
|
||||||
|
/>
|
||||||
|
<div className={styles.callbackActions}>
|
||||||
|
<Button
|
||||||
|
variant="secondary"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => submitCallback(provider.id)}
|
||||||
|
loading={state.callbackSubmitting}
|
||||||
|
>
|
||||||
|
{t('auth_login.oauth_callback_button')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
{state.callbackStatus === 'success' && (
|
||||||
|
<div className="status-badge success" style={{ marginTop: 8 }}>
|
||||||
|
{t('auth_login.oauth_callback_status_success')}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{state.callbackStatus === 'error' && (
|
||||||
|
<div className="status-badge error" style={{ marginTop: 8 }}>
|
||||||
|
{t('auth_login.oauth_callback_status_error')} {state.callbackError || ''}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{state.status && state.status !== 'idle' && (
|
||||||
<div className="status-badge" style={{ marginTop: 8 }}>
|
<div className="status-badge" style={{ marginTop: 8 }}>
|
||||||
{state.status === 'success'
|
{state.status === 'success'
|
||||||
? t('auth_login.codex_oauth_status_success')
|
? t('auth_login.codex_oauth_status_success')
|
||||||
|
|||||||
@@ -66,11 +66,12 @@
|
|||||||
border: 1px solid var(--border-color);
|
border: 1px solid var(--border-color);
|
||||||
background: var(--bg-primary);
|
background: var(--bg-primary);
|
||||||
box-shadow: var(--shadow-lg);
|
box-shadow: var(--shadow-lg);
|
||||||
|
}
|
||||||
|
|
||||||
:global(.loading-spinner) {
|
.loadingOverlaySpinner {
|
||||||
border-color: rgba(59, 130, 246, 0.25);
|
border-color: rgba(59, 130, 246, 0.25);
|
||||||
border-top-color: var(--primary-color);
|
border-top-color: var(--primary-color);
|
||||||
}
|
box-shadow: 0 0 10px rgba(59, 130, 246, 0.25);
|
||||||
}
|
}
|
||||||
|
|
||||||
.loadingOverlayText {
|
.loadingOverlayText {
|
||||||
|
|||||||
@@ -520,7 +520,7 @@ export function UsagePage() {
|
|||||||
{loading && !usage && (
|
{loading && !usage && (
|
||||||
<div className={styles.loadingOverlay} aria-busy="true">
|
<div className={styles.loadingOverlay} aria-busy="true">
|
||||||
<div className={styles.loadingOverlayContent}>
|
<div className={styles.loadingOverlayContent}>
|
||||||
<LoadingSpinner size={28} />
|
<LoadingSpinner size={28} className={styles.loadingOverlaySpinner} />
|
||||||
<span className={styles.loadingOverlayText}>{t('common.loading')}</span>
|
<span className={styles.loadingOverlayText}>{t('common.loading')}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { apiClient } from './client';
|
import { apiClient } from './client';
|
||||||
|
import { LOGS_TIMEOUT_MS } from '@/utils/constants';
|
||||||
|
|
||||||
export interface LogsQuery {
|
export interface LogsQuery {
|
||||||
after?: number;
|
after?: number;
|
||||||
@@ -25,14 +26,17 @@ export interface ErrorLogsResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const logsApi = {
|
export const logsApi = {
|
||||||
fetchLogs: (params: LogsQuery = {}): Promise<LogsResponse> => apiClient.get('/logs', { params }),
|
fetchLogs: (params: LogsQuery = {}): Promise<LogsResponse> =>
|
||||||
|
apiClient.get('/logs', { params, timeout: LOGS_TIMEOUT_MS }),
|
||||||
|
|
||||||
clearLogs: () => apiClient.delete('/logs'),
|
clearLogs: () => apiClient.delete('/logs'),
|
||||||
|
|
||||||
fetchErrorLogs: (): Promise<ErrorLogsResponse> => apiClient.get('/request-error-logs'),
|
fetchErrorLogs: (): Promise<ErrorLogsResponse> =>
|
||||||
|
apiClient.get('/request-error-logs', { timeout: LOGS_TIMEOUT_MS }),
|
||||||
|
|
||||||
downloadErrorLog: (filename: string) =>
|
downloadErrorLog: (filename: string) =>
|
||||||
apiClient.getRaw(`/request-error-logs/${encodeURIComponent(filename)}`, {
|
apiClient.getRaw(`/request-error-logs/${encodeURIComponent(filename)}`, {
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
|
timeout: LOGS_TIMEOUT_MS
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ export interface OAuthStartResponse {
|
|||||||
state?: string;
|
state?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface OAuthCallbackResponse {
|
||||||
|
status: 'ok';
|
||||||
|
}
|
||||||
|
|
||||||
export interface IFlowCookieAuthResponse {
|
export interface IFlowCookieAuthResponse {
|
||||||
status: 'ok' | 'error';
|
status: 'ok' | 'error';
|
||||||
error?: string;
|
error?: string;
|
||||||
@@ -27,18 +31,37 @@ export interface IFlowCookieAuthResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const WEBUI_SUPPORTED: OAuthProvider[] = ['codex', 'anthropic', 'antigravity', 'gemini-cli', 'iflow'];
|
const WEBUI_SUPPORTED: OAuthProvider[] = ['codex', 'anthropic', 'antigravity', 'gemini-cli', 'iflow'];
|
||||||
|
const CALLBACK_PROVIDER_MAP: Partial<Record<OAuthProvider, string>> = {
|
||||||
|
'gemini-cli': 'gemini'
|
||||||
|
};
|
||||||
|
|
||||||
export const oauthApi = {
|
export const oauthApi = {
|
||||||
startAuth: (provider: OAuthProvider) =>
|
startAuth: (provider: OAuthProvider, options?: { projectId?: string }) => {
|
||||||
apiClient.get<OAuthStartResponse>(`/${provider}-auth-url`, {
|
const params: Record<string, string | boolean> = {};
|
||||||
params: WEBUI_SUPPORTED.includes(provider) ? { is_webui: true } : undefined
|
if (WEBUI_SUPPORTED.includes(provider)) {
|
||||||
}),
|
params.is_webui = true;
|
||||||
|
}
|
||||||
|
if (provider === 'gemini-cli' && options?.projectId) {
|
||||||
|
params.project_id = options.projectId;
|
||||||
|
}
|
||||||
|
return apiClient.get<OAuthStartResponse>(`/${provider}-auth-url`, {
|
||||||
|
params: Object.keys(params).length ? params : undefined
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
getAuthStatus: (state: string) =>
|
getAuthStatus: (state: string) =>
|
||||||
apiClient.get<{ status: 'ok' | 'wait' | 'error'; error?: string }>(`/get-auth-status`, {
|
apiClient.get<{ status: 'ok' | 'wait' | 'error'; error?: string }>(`/get-auth-status`, {
|
||||||
params: { state }
|
params: { state }
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
submitCallback: (provider: OAuthProvider, redirectUrl: string) => {
|
||||||
|
const callbackProvider = CALLBACK_PROVIDER_MAP[provider] ?? provider;
|
||||||
|
return apiClient.post<OAuthCallbackResponse>('/oauth-callback', {
|
||||||
|
provider: callbackProvider,
|
||||||
|
redirect_url: redirectUrl
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
/** iFlow cookie 认证 */
|
/** iFlow cookie 认证 */
|
||||||
iflowCookieAuth: (cookie: string) =>
|
iflowCookieAuth: (cookie: string) =>
|
||||||
apiClient.post<IFlowCookieAuthResponse>('/iflow-auth-url', { cookie })
|
apiClient.post<IFlowCookieAuthResponse>('/iflow-auth-url', { cookie })
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export const LOG_REFRESH_DELAY_MS = 500;
|
|||||||
// 日志相关
|
// 日志相关
|
||||||
export const MAX_LOG_LINES = 2000;
|
export const MAX_LOG_LINES = 2000;
|
||||||
export const LOG_FETCH_LIMIT = 2500;
|
export const LOG_FETCH_LIMIT = 2500;
|
||||||
|
export const LOGS_TIMEOUT_MS = 60 * 1000;
|
||||||
|
|
||||||
// 认证文件分页
|
// 认证文件分页
|
||||||
export const DEFAULT_AUTH_FILES_PAGE_SIZE = 20;
|
export const DEFAULT_AUTH_FILES_PAGE_SIZE = 20;
|
||||||
|
|||||||
Reference in New Issue
Block a user