diff --git a/apps/admin-web/src/api/adminApiTypes.ts b/apps/admin-web/src/api/adminApiTypes.ts index 637ecc213..c3a9e7256 100644 --- a/apps/admin-web/src/api/adminApiTypes.ts +++ b/apps/admin-web/src/api/adminApiTypes.ts @@ -1075,7 +1075,7 @@ export interface AdminRechargeRefundActionResponse { export interface AdminWalletRestrictionResponse { wallet: AdminProfileWalletPayload; } -export type AdminAgcAgentMode = 'codex' | 'cc'; +export type AdminAgcAgentMode = 'codex' | 'cc' | 'anthropic'; export interface AdminAgcModel { id: string; diff --git a/apps/admin-web/src/pages/AdminAgcModelsPage.tsx b/apps/admin-web/src/pages/AdminAgcModelsPage.tsx index c64efc67d..cab805cf7 100644 --- a/apps/admin-web/src/pages/AdminAgcModelsPage.tsx +++ b/apps/admin-web/src/pages/AdminAgcModelsPage.tsx @@ -226,6 +226,7 @@ export function AdminAgcModelsPage({ > + diff --git a/apps/ai-game-creator-shell/scripts/check-config.mjs b/apps/ai-game-creator-shell/scripts/check-config.mjs index 1b964573f..a7dda892c 100644 --- a/apps/ai-game-creator-shell/scripts/check-config.mjs +++ b/apps/ai-game-creator-shell/scripts/check-config.mjs @@ -140,6 +140,7 @@ const allowedUncalledTauriCommands = [ // 里以字面量出现，静态扫描仍按共享注册表核验。 'read_profile_recharge_center', 'read_profile_wallet_ledger', + 'read_profile_referral_invite_center', 'create_profile_recharge_order', 'confirm_wechat_profile_recharge_order', 'redeem_profile_reward_code', diff --git a/apps/ai-game-creator-shell/src-tauri/src/account_api.rs b/apps/ai-game-creator-shell/src-tauri/src/account_api.rs index 3f882e163..2cdc1b40d 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/account_api.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/account_api.rs @@ -8,10 +8,12 @@ use crate::http_client::agc_main_site_client_builder; use crate::platform_session::{current_platform_session, PlatformSessionSnapshot}; use reqwest::{Method, StatusCode}; use serde::de::DeserializeOwned; +use serde::Serialize; use serde_json::Value; use shared_contracts::runtime::{ ConfirmWechatProfileRechargeOrderResponse, CreateProfileRechargeOrderResponse, - ProfileRechargeCenterResponse, ProfileWalletLedgerResponse, RedeemProfileRewardCodeResponse, + ProfileRechargeCenterResponse, ProfileReferralInviteCenterResponse, + ProfileWalletLedgerResponse, RedeemProfileRewardCodeResponse, }; use std::time::Duration; use url::Url; @@ -103,6 +105,29 @@ fn unwrap_envelope(body: &str, fallback: &str) -> Result { Ok(value.get("data").cloned().unwrap_or(value)) } +/// 客户端邀请码弹层需要的完整数据。 +/// +/// 后端只返回站内相对路径（`inviteLinkPath`），客户端要拿它当分享链接用， +/// 所以这里用当前登录站点 origin 补全成完整 URL 再交给渲染层。 +#[derive(Clone, Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub(crate) struct ClientProfileReferralInviteCenter { + pub(crate) center: ProfileReferralInviteCenterResponse, + pub(crate) invite_url: String, +} + +fn resolve_invite_url(api_base_url: &str, invite_link_path: &str) -> String { + if invite_link_path.trim().is_empty() { + return api_base_url.trim_end_matches('/').to_string(); + } + match Url::parse(&format!("{}/", api_base_url.trim_end_matches('/'))) + .and_then(|base| base.join(invite_link_path)) + { + Ok(url) => url.to_string(), + Err(_) => invite_link_path.to_string(), + } +} + async fn request_json( client: &reqwest::Client, snapshot: &PlatformSessionSnapshot, @@ -171,6 +196,24 @@ pub(crate) async fn read_profile_wallet_ledger() -> Result Result { + let snapshot = require_session()?; + let client = build_client()?; + let center: ProfileReferralInviteCenterResponse = request_json( + &client, + &snapshot, + Method::GET, + &["api", "profile", "referrals", "invite-center"], + None, + "读取邀请码失败", + ) + .await?; + let invite_url = resolve_invite_url(&snapshot.api_base_url, ¢er.invite_link_path); + Ok(ClientProfileReferralInviteCenter { center, invite_url }) +} + #[tauri::command] pub(crate) async fn create_profile_recharge_order( product_id: String, @@ -314,4 +357,20 @@ mod tests { assert!(bounded_business_id(&"x".repeat(MAX_BUSINESS_ID_CHARS + 1), "订单").is_err()); assert!(bounded_business_id("bad\nid", "订单").is_err()); } + + #[test] + fn invite_link_resolves_against_login_origin() { + assert_eq!( + resolve_invite_url("https://dev.genarrative.world", "/?inviteCode=SY12345678"), + "https://dev.genarrative.world/?inviteCode=SY12345678" + ); + assert_eq!( + resolve_invite_url("https://dev.genarrative.world/", "invite/SY12345678"), + "https://dev.genarrative.world/invite/SY12345678" + ); + assert_eq!( + resolve_invite_url("https://dev.genarrative.world", ""), + "https://dev.genarrative.world" + ); + } } diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs index 8adffce7d..263b314da 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs @@ -352,7 +352,21 @@ fn copy_env(command: &mut tokio::process::Command, name: &str) { fn claude_base_url(llm: Option<&GameCreatorLlmConfig>) -> Option { std::env::var("ANTHROPIC_BASE_URL") .ok() - .or_else(|| llm.map(|value| value.base_url.trim_end_matches('/').to_string())) + .or_else(|| { + let llm = llm?; + // Official models never talk to the Router directly: the account + // Router credential lives server-side, so the Claude sidecar goes + // through the platform gateway and appends `/v1/messages` itself. + if !llm.custom_enabled { + if let Some(session) = crate::platform_session::current_platform_session() { + return Some(format!( + "{}/api/llm/anthropic", + session.api_base_url.trim_end_matches('/') + )); + } + } + Some(llm.base_url.trim_end_matches('/').to_string()) + }) .map(|value| { value .trim_end_matches('/') diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs index 0b0cbb827..d81e102aa 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs @@ -2351,7 +2351,7 @@ impl CodexAppServerConnection { ) })?; effective_llm.base_url = - format!("{}/api/llm", session.api_base_url.trim_end_matches('/')); + format!("{}/api/llm/v1", session.api_base_url.trim_end_matches('/')); effective_llm.api_key.clear(); // Only the platform catalog identifier reaches Codex. api-server // validates it and resolves the actual upstream model. @@ -2619,7 +2619,7 @@ impl CodexAppServerConnection { .. } => ( Some(( - format!("{}/api/llm", api_base_url.trim_end_matches('/')), + format!("{}/api/llm/v1", api_base_url.trim_end_matches('/')), access_token.clone(), )), true, diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs index c5f2192cc..b5c910a84 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs @@ -1098,7 +1098,8 @@ fn select_game_creator_model_inner( if let Some(agent_mode) = catalog_agent_mode { config.agent_mode = match agent_mode.trim() { "codex" => GAME_CREATOR_AGENT_MODE_CODEX_APP_SERVER.to_string(), - "cc" => GAME_CREATOR_AGENT_MODE_CLAUDE_CODE_CLI.to_string(), + // `cc` 是 Claude 执行器的历史别名，`anthropic` 是同一执行器的显式协议值。 + "cc" | "anthropic" => GAME_CREATOR_AGENT_MODE_CLAUDE_CODE_CLI.to_string(), value => return Err(format!("模型 Agent 模式无效：{value}")), }; } diff --git a/apps/ai-game-creator-shell/src-tauri/src/config.rs b/apps/ai-game-creator-shell/src-tauri/src/config.rs index 8a16b71a8..6eb153861 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/config.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/config.rs @@ -222,7 +222,8 @@ fn build_game_creator_official_platform_llm_config( if api_base_url.is_empty() { return Err("登录态缺少 API Server 地址".to_string()); } - let proxy_base_url = format!("{api_base_url}/api/llm"); + // baseUrl 不带路由与版本段，OpenAI 协议由 platform-llm 自己拼 `v1/`。 + let proxy_base_url = format!("{api_base_url}/api/llm/v1"); LlmConfig::new( LlmProvider::OpenAiCompatible, proxy_base_url, diff --git a/apps/ai-game-creator-shell/src-tauri/src/desktop.rs b/apps/ai-game-creator-shell/src-tauri/src/desktop.rs index 29268e088..0c479c168 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/desktop.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/desktop.rs @@ -638,6 +638,7 @@ pub(super) fn run() { set_client_server_selection, read_profile_recharge_center, read_profile_wallet_ledger, + read_profile_referral_invite_center, create_profile_recharge_order, confirm_wechat_profile_recharge_order, redeem_profile_reward_code, diff --git a/apps/ai-game-creator-shell/src/features/app-shell/AccountReferral.tsx b/apps/ai-game-creator-shell/src/features/app-shell/AccountReferral.tsx new file mode 100644 index 000000000..1ab5f56b7 --- /dev/null +++ b/apps/ai-game-creator-shell/src/features/app-shell/AccountReferral.tsx @@ -0,0 +1,48 @@ +import { PlatformProfileReferralModal } from '../../../../../packages/shared/src/components/PlatformProfileReferralModal'; +import type { + AccountReferralController, + AccountReferralPanel, +} from './useAccountReferral'; + +/** 客户端账号菜单的入口文案是「邀请码 / 玩家社区」，弹层标题跟着入口走。 */ +const CLIENT_REFERRAL_PANEL_TITLE: Record = { + invite: '邀请码', + community: '玩家社区', +}; + +/** + * 账号菜单的邀请码 / 玩家社区弹层。 + * + * 弹层实现与主站「我的」页签共用 `packages/shared` 里的同一份 + * `PlatformProfileReferralModal`（与充值、泥点账单同口径）；这里只做宿主适配： + * 把 Tauri typed command 读到的邀请中心、会话 origin 补全后的邀请链接、宿主剪贴板 + * 复制回显和面板开关接到共享组件上，不再另写一份客户端专属弹层。 + */ +export function AccountReferralDialogs({ + controller, +}: { + controller: AccountReferralController; +}) { + if (!controller.panel) { + return null; + } + + return ( + + ); +} diff --git a/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx b/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx index 145e33445..3af7db68f 100644 --- a/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx +++ b/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx @@ -41,6 +41,7 @@ import { useDirectActiveTurns } from '../agent-runtime/directActiveTurns'; import { projectPathsMatchForInvalidation } from '../project-summary/projectPath'; import { RuntimeConfigDialog } from '../runtime-config/RuntimeConfigDialog'; import { useTemplateLibrary } from '../template-library/useTemplateLibrary'; +import { AccountReferralDialogs } from './AccountReferral'; import { AccountWalletBar, AccountWalletDialogs } from './AccountWallet'; import { type LauncherNotice, @@ -52,6 +53,7 @@ import type { WorkspaceLauncherShellProps, } from './model'; import { NonEmptyProjectDialog, ProjectsPage } from './ProjectCreation'; +import { useAccountReferral } from './useAccountReferral'; import { useAccountWallet } from './useAccountWallet'; import { DESIGN_ARTIFACTS_BUILD_PROMPT, @@ -73,6 +75,7 @@ export function WorkspaceLauncherShell({ setActiveProjectRuns, } = useWindowChrome(); const accountWallet = useAccountWallet(currentUser.id); + const accountReferral = useAccountReferral(currentUser.id); const [status, setStatus] = useState(''); const recentProjects = useRecentProjects(setStatus); const { recentProjectRows, rememberRecentWorkspace } = recentProjects; @@ -741,6 +744,11 @@ export function WorkspaceLauncherShell({ }} onNoticeRequest={showLauncherNotice} onRechargeRequest={accountWallet.openRecharge} + onReferralRequest={(panel) => + panel === 'invite' + ? accountReferral.openInvite() + : accountReferral.openCommunity() + } onRuntimeConfigOpen={() => setRuntimeConfigOpen(true)} onViewChange={navigateLauncher} /> @@ -963,6 +971,7 @@ export function WorkspaceLauncherShell({ /> ) : null} + {walletSlot ? ( createPortal( , diff --git a/apps/ai-game-creator-shell/src/features/app-shell/useAccountReferral.ts b/apps/ai-game-creator-shell/src/features/app-shell/useAccountReferral.ts new file mode 100644 index 000000000..76c99d35c --- /dev/null +++ b/apps/ai-game-creator-shell/src/features/app-shell/useAccountReferral.ts @@ -0,0 +1,143 @@ +import { writeText } from '@tauri-apps/plugin-clipboard-manager'; +import { useEffect, useLayoutEffect, useRef, useState } from 'react'; + +import type { PlatformProfileReferralCopyState } from '../../../../../packages/shared/src/components/PlatformProfileReferralModal'; +import type { ProfileReferralInviteCenterResponse } from '../../../../../packages/shared/src/contracts/runtime'; +import { getClientProfileReferralInviteCenter } from '../../services/accountHost'; + +export type AccountReferralPanel = 'invite' | 'community'; + +/** + * 客户端账号菜单的邀请码 / 玩家社区弹层控制器。 + * + * 邀请码是账号级数据，和泥点余额一样按登录账号隔离：切换账号就丢弃上一位用户的 + * 邀请中心和复制回显；读取过程中换账号时，晚到的响应直接作废。 + */ +export function useAccountReferral(currentUserId: string) { + const [panel, setPanel] = useState(null); + const [center, setCenter] = + useState(null); + const [inviteUrl, setInviteUrl] = useState(null); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(null); + const [copyInviteLinkState, setCopyInviteLinkState] = + useState('idle'); + const [copyInviteCodeState, setCopyInviteCodeState] = + useState('idle'); + const lifecycleRef = useRef(0); + const currentUserIdRef = useRef(currentUserId); + + useLayoutEffect(() => { + currentUserIdRef.current = currentUserId; + lifecycleRef.current += 1; + }, [currentUserId]); + + useEffect(() => { + lifecycleRef.current += 1; + setPanel(null); + setCenter(null); + setInviteUrl(null); + setLoading(false); + setError(null); + setCopyInviteLinkState('idle'); + setCopyInviteCodeState('idle'); + }, [currentUserId]); + + async function loadInviteCenter(lifecycle: number, owner: string) { + setLoading(true); + setError(null); + try { + const response = await getClientProfileReferralInviteCenter(); + if ( + lifecycleRef.current !== lifecycle || + currentUserIdRef.current !== owner + ) { + return; + } + setCenter(response.center); + setInviteUrl(response.inviteUrl); + } catch (loadError) { + if ( + lifecycleRef.current !== lifecycle || + currentUserIdRef.current !== owner + ) { + return; + } + setCenter(null); + setInviteUrl(null); + setError( + loadError instanceof Error ? loadError.message : '读取邀请码失败', + ); + } finally { + if ( + lifecycleRef.current === lifecycle && + currentUserIdRef.current === owner + ) { + setLoading(false); + } + } + } + + function openPanel(nextPanel: AccountReferralPanel) { + const lifecycle = ++lifecycleRef.current; + setPanel(nextPanel); + setError(null); + setCopyInviteLinkState('idle'); + setCopyInviteCodeState('idle'); + if (nextPanel !== 'invite') { + return; + } + void loadInviteCenter(lifecycle, currentUserId); + } + + function closePanel() { + lifecycleRef.current += 1; + setPanel(null); + setLoading(false); + setCopyInviteLinkState('idle'); + setCopyInviteCodeState('idle'); + } + + async function copyValue( + applyState: (state: PlatformProfileReferralCopyState) => void, + value: string, + ) { + try { + await writeText(value); + applyState('copied'); + } catch { + applyState('failed'); + } + } + + function copyInviteCode() { + if (!center?.inviteCode) { + return; + } + void copyValue(setCopyInviteCodeState, center.inviteCode); + } + + function copyInviteLink() { + if (!inviteUrl) { + return; + } + void copyValue(setCopyInviteLinkState, inviteUrl); + } + + return { + center, + copyInviteCodeState, + copyInviteCode, + copyInviteLink, + copyInviteLinkState, + error, + inviteUrl, + loading, + panel, + openInvite: () => openPanel('invite'), + openCommunity: () => openPanel('community'), + closePanel, + }; +} + +export type AccountReferralController = ReturnType; diff --git a/apps/ai-game-creator-shell/src/services/accountHost.ts b/apps/ai-game-creator-shell/src/services/accountHost.ts index 479874be9..da82f4168 100644 --- a/apps/ai-game-creator-shell/src/services/accountHost.ts +++ b/apps/ai-game-creator-shell/src/services/accountHost.ts @@ -2,6 +2,7 @@ import type { ConfirmWechatProfileRechargeOrderResponse, CreateProfileRechargeOrderResponse, ProfileRechargeCenterResponse, + ProfileReferralInviteCenterResponse, ProfileWalletLedgerResponse, RedeemProfileRewardCodeResponse, } from '../../../../packages/shared/src/contracts/runtime'; @@ -40,6 +41,17 @@ export function getClientProfileWalletLedger() { ); } +export type ClientProfileReferralInviteCenterResponse = { + center: ProfileReferralInviteCenterResponse; + inviteUrl: string; +}; + +export function getClientProfileReferralInviteCenter() { + return invokeAccount( + 'read_profile_referral_invite_center', + ); +} + export function createClientProfileRechargeOrder(productId: string) { return invokeAccount( 'create_profile_recharge_order', diff --git a/apps/ai-game-creator-shell/src/services/clientApi.ts b/apps/ai-game-creator-shell/src/services/clientApi.ts index 2f4de6483..2221e5cfd 100644 --- a/apps/ai-game-creator-shell/src/services/clientApi.ts +++ b/apps/ai-game-creator-shell/src/services/clientApi.ts @@ -3,7 +3,7 @@ import { resolveTauriInvoke } from '../app/tauri'; export type ClientLlmModel = { displayName: string; id: string; - agentMode: 'codex' | 'cc'; + agentMode: 'codex' | 'cc' | 'anthropic'; }; export type ClientLlmModelCatalog = { diff --git a/apps/ai-game-creator-shell/src/view/layout.tsx b/apps/ai-game-creator-shell/src/view/layout.tsx index 642cd7a87..621c98708 100644 --- a/apps/ai-game-creator-shell/src/view/layout.tsx +++ b/apps/ai-game-creator-shell/src/view/layout.tsx @@ -46,6 +46,7 @@ type LauncherSidebarProps = { onViewChange: (view: LauncherView) => void; onNoticeRequest: (title: string) => void; onRechargeRequest: () => void; + onReferralRequest: (panel: 'invite' | 'community') => void; onRuntimeConfigOpen: () => void; onLogout: () => void; }; @@ -56,6 +57,7 @@ type SidebarAccountMenuProps = { onLogout: () => void; onNoticeRequest: (title: string) => void; onRechargeRequest: () => void; + onReferralRequest: (panel: 'invite' | 'community') => void; }; function formatMudPoints(value: number | null | undefined) { @@ -71,6 +73,7 @@ function SidebarAccountMenu({ onLogout, onNoticeRequest, onRechargeRequest, + onReferralRequest, }: SidebarAccountMenuProps) { const walletBalance = useWalletStore( (state) => state.mudPointBalance?.totalPoints ?? null, @@ -164,6 +167,28 @@ function SidebarAccountMenu({ > 使用指南 + + +
+ {title} +
+ {content} + + {error ? ( + + {error} + + ) : null} + {success ? ( + + {success} + + ) : null} + + + ); +} + +export default PlatformProfileReferralModal; diff --git a/packages/shared/src/components/PlatformProfileReferralModal/model.ts b/packages/shared/src/components/PlatformProfileReferralModal/model.ts new file mode 100644 index 000000000..dfa3b47f2 --- /dev/null +++ b/packages/shared/src/components/PlatformProfileReferralModal/model.ts @@ -0,0 +1,53 @@ +import type { ProfileReferralInviteCenterResponse } from '../../contracts/runtime'; + +export type PlatformProfileReferralPanel = 'invite' | 'redeem' | 'community'; +export type PlatformProfileReferralCopyState = 'idle' | 'copied' | 'failed'; + +export function normalizePlatformProfileReferralRedeemCode(value: string) { + return value + .trim() + .replace(/[^0-9a-z]/gi, '') + .toUpperCase(); +} + +/** + * 邀请奖励的当日额度由后端字段推导。 + * + * 后端只返回「今日已获得次数」和「今日剩余次数」，两者相加就是当前生效的每日上限 + * （当前 `PROFILE_REFERRAL_DAILY_INVITER_REWARD_LIMIT = 10`）。前端不再另存一份写死的 + * `10`：上限调整时两端文案自动跟着走。 + */ +export function resolvePlatformProfileReferralDailyLimit( + center: ProfileReferralInviteCenterResponse | null, +) { + if (!center) { + return null; + } + return center.todayInviterRewardCount + center.todayInviterRewardRemaining; +} + +/** + * 邀请面板的奖励说明。 + * + * 语义边界（后端 `redeem_profile_referral_invite_code`）：被邀请人每次都拿满 + * `rewardPoints`；每日上限只压邀请人一侧，超过上限后邀请人当日不再获得奖励， + * 邀请关系本身仍然成立。 + */ +export function buildPlatformProfileReferralRewardCopy( + center: ProfileReferralInviteCenterResponse | null, +) { + if (!center) { + return null; + } + const dailyLimit = resolvePlatformProfileReferralDailyLimit(center); + return { + rewardPoints: center.rewardPoints, + dailyLimit, + remainingToday: center.todayInviterRewardRemaining, + inviteeRewardLine: `邀请一位好友注册，好友每次都能获得 ${center.rewardPoints} 泥点。`, + inviterRewardLine: + dailyLimit === null + ? `好友完成注册后你也可以获得 ${center.rewardPoints} 泥点。` + : `好友完成注册后你也可以获得 ${center.rewardPoints} 泥点；每天最多 ${dailyLimit} 次，今日还剩 ${center.todayInviterRewardRemaining} 次。`, + }; +} diff --git a/scripts/check-native-shells.mjs b/scripts/check-native-shells.mjs index 541e0c06e..ab074c958 100644 --- a/scripts/check-native-shells.mjs +++ b/scripts/check-native-shells.mjs @@ -292,8 +292,8 @@ const h5HostBridgeCallChainWrapperFiles = [ const h5HostBridgeRequiredCallChainFiles = [ 'src/ActiveApp.tsx', 'src/components/auth/AuthGate.tsx', + 'src/components/platform-entry/PlatformEntryActiveFlowShell.tsx', 'src/components/platform-entry/PlatformFeedbackView.tsx', - 'src/components/platform-entry/PlatformProfileReferralModal.tsx', 'src/components/platform-entry/PlatformProfileRewardCodeRedeemModal.tsx', 'src/components/platform-entry/usePlatformProfileCenterController.ts', 'src/hooks/useHostNavigationCanGoBack.ts', diff --git a/server-rs/crates/api-server/src/llm/mod.rs b/server-rs/crates/api-server/src/llm/mod.rs index 439ddbd7e..3ff4dc75c 100644 --- a/server-rs/crates/api-server/src/llm/mod.rs +++ b/server-rs/crates/api-server/src/llm/mod.rs @@ -365,7 +365,7 @@ pub async fn proxy_llm_responses( .with_message(format!("创建 LLM Router 请求客户端失败：{error}")), ) })?; - let upstream_url = format!("{}/responses", base_url.trim_end_matches('/')); + let upstream_url = router_protocol_url(&base_url, "responses"); let mut request = client .post(upstream_url) .bearer_auth(api_key) @@ -470,6 +470,227 @@ pub async fn proxy_llm_responses( ) } +/// Proxies the Anthropic Messages protocol for the LLM Router. +/// +/// Credential boundary is identical to [`proxy_llm_responses`]: the caller only +/// presents the platform access token, and the account-owned Router credential +/// is resolved inside api-server and never returned to the client. The Claude +/// Agent SDK appends `/v1/messages` to `ANTHROPIC_BASE_URL`, so this route is +/// registered at that exact path and only rewrites `model`. +pub async fn proxy_llm_messages( + State(state): State, + Extension(request_context): Extension, + Extension(authenticated): Extension, + headers: HeaderMap, + body: Bytes, +) -> Result { + if body.len() > LLM_REQUEST_MAX_BODY_BYTES { + return Err(llm_error_response( + &request_context, + AppError::from_status(StatusCode::PAYLOAD_TOO_LARGE) + .with_message("LLM Messages 请求体超过大小限制"), + )); + } + + if let Err(error) = + ensure_llm_router_user_can_start_conversation(&state, authenticated.claims().user_id()) + .await + { + return Err(llm_error_response(&request_context, error)); + } + + let mut payload = serde_json::from_slice::(&body).map_err(|_| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::BAD_REQUEST) + .with_message("LLM Messages 请求体必须是合法 JSON"), + ) + })?; + let object = payload.as_object_mut().ok_or_else(|| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::BAD_REQUEST) + .with_message("LLM Messages 请求体必须是 JSON 对象"), + ) + })?; + let requested_model = object + .get("model") + .and_then(Value::as_str) + .map(str::trim) + .filter(|value| !value.is_empty()) + .map(str::to_string); + // Same boundary as Responses: provider/credential controls never reach the + // Router, even when an older desktop build still sends them. + for field in [ + "apiKey", + "api_key", + "baseUrl", + "base_url", + "provider", + "apiKind", + "api_kind", + "agentLlm", + "agent_llm", + "agentMode", + "agent_mode", + ] { + object.remove(field); + } + let catalog = load_llm_catalog(&state, authenticated.claims().user_id()) + .await + .map_err(|error| llm_error_response(&request_context, error))?; + // 这条路由只服务 AGC 的 Anthropic 执行器。Claude Agent SDK 直连网关、不会补 + // `x-genarrative-client` 标记，所以这里直接按目录解析客户端选的稳定标识； + // 目录外取值仍由 `resolve_requested` 拒绝。 + let requested_model = requested_model.as_deref(); + let selected_model = catalog + .resolve_requested(requested_model) + .map_err(|message| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_message(message), + ) + })? + .to_string(); + object.insert("model".to_string(), Value::String(selected_model)); + + let (base_url, api_key, key_id) = + resolve_llm_router_credentials(&state, authenticated.claims().user_id()) + .await + .map_err(|error| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::SERVICE_UNAVAILABLE).with_message(error), + ) + })?; + + prepare_llm_router_billing(&state, authenticated.claims().user_id()) + .await + .map_err(|error| llm_error_response(&request_context, error))?; + + let client = reqwest::Client::builder() + .connect_timeout(std::time::Duration::from_secs(15)) + .read_timeout(std::time::Duration::from_secs(180)) + .redirect(reqwest::redirect::Policy::none()) + .build() + .map_err(|error| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR) + .with_message(format!("创建 LLM Router 请求客户端失败：{error}")), + ) + })?; + let upstream_url = router_protocol_url(&base_url, "messages"); + // The Router speaks Anthropic Messages on this path; accept both credential + // headers because the SDK uses `x-api-key` while the gateway also allows + // `Authorization: Bearer`. + let mut request = client + .post(upstream_url) + .header("x-api-key", api_key.clone()) + .bearer_auth(api_key) + .header("content-type", "application/json"); + for name in ["anthropic-version", "anthropic-beta", "accept"] { + if let Some(value) = headers.get(name) { + request = request.header(name, value); + } + } + let upstream = request + .body(serde_json::to_vec(&payload).map_err(|error| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR) + .with_message(format!("序列化 LLM Messages 请求失败：{error}")), + ) + })?) + .send() + .await + .map_err(|error| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::BAD_GATEWAY) + .with_message(format!("LLM Router 暂时不可用：{error}")), + ) + })?; + + let status = upstream.status(); + if matches!(status, StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN) { + if let Err(error) = crate::external_api_keys::revoke_llm_router_account( + &state, + authenticated.claims().user_id(), + &key_id, + ) + .await + { + tracing::warn!( + request_id = request_context.request_id(), + user_id = %authenticated.claims().user_id(), + key_id = %key_id, + error = %error, + "LLM Router 返回确定鉴权失败，但本地账号 Key 失效标记未完成" + ); + } + } + let upstream_headers = upstream.headers().clone(); + let is_stream = payload + .get("stream") + .and_then(Value::as_bool) + .unwrap_or(false); + if !is_stream { + let body = upstream.bytes().await.map_err(|error| { + llm_error_response( + &request_context, + AppError::from_status(StatusCode::BAD_GATEWAY) + .with_message(format!("读取 LLM Router 响应失败：{error}")), + ) + })?; + if status.is_success() { + if let Err(error) = + settle_llm_router_usage(&state, authenticated.claims().user_id()).await + { + tracing::error!( + request_id = request_context.request_id(), + user_id = %authenticated.claims().user_id(), + error = %error, + "LLM Router Messages 成功但累计额度同步未完成" + ); + } + } + return build_upstream_response( + status, + &upstream_headers, + Body::from(body), + &request_context, + ); + } + + if !status.is_success() { + let stream = upstream.bytes_stream().map(|chunk| { + chunk.map_err(|error| { + std::io::Error::other(format!("LLM Router 响应流读取失败：{error}")) + }) + }); + return build_upstream_response( + status, + &upstream_headers, + Body::from_stream(stream), + &request_context, + ); + } + + let stream = stream_messages_with_billing( + upstream.bytes_stream(), + state.clone(), + authenticated.claims().user_id().to_string(), + request_context.request_id().to_string(), + ); + build_upstream_response( + status, + &upstream_headers, + Body::from_stream(stream), + &request_context, + ) +} + fn build_upstream_response( status: StatusCode, upstream_headers: &HeaderMap, @@ -666,6 +887,17 @@ fn is_responses_done_sse_event(event: &str) -> bool { .any(|line| matches!(line.trim(), "data: [DONE]" | "[DONE]")) } +/// Anthropic Messages ends a stream with `message_stop` and has no `[DONE]` +/// sentinel, so the terminal event is the only settle point. +fn is_messages_terminal_sse_event(event: &str) -> bool { + event.lines().any(|line| { + let line = line.trim(); + line == "event: message_stop" + || line.contains("\"type\":\"message_stop\"") + || line.contains("\"type\": \"message_stop\"") + }) +} + fn finalize_llm_router_terminal_event( terminal_event: &mut Option, billing_result: Option<&Result<(), AppError>>, @@ -816,6 +1048,77 @@ fn stream_responses_with_billing( } } +/// Passes an Anthropic Messages SSE stream through unchanged and settles the +/// account quota once the upstream signals `message_stop`. +/// +/// The bytes are forwarded verbatim so the Claude Agent SDK keeps parsing the +/// same event shapes it received before the platform gateway was introduced. +fn stream_messages_with_billing( + mut upstream: impl futures_util::Stream> + Unpin, + state: AppState, + owner_user_id: String, + request_id: String, +) -> impl futures_util::Stream> { + async_stream::stream! { + let mut pending = String::new(); + let mut utf8_pending = Vec::new(); + let mut billing_result = None; + + while let Some(chunk) = upstream.next().await { + match chunk { + Ok(bytes) => { + append_utf8_chunk(&mut pending, &mut utf8_pending, bytes.as_ref()); + pending = pending.replace("\r\n", "\n"); + while let Some(separator) = pending.find("\n\n") { + let raw_event = pending[..separator + 2].to_string(); + let event = pending[..separator].to_string(); + pending.drain(..separator + 2); + if is_messages_terminal_sse_event(&event) && billing_result.is_none() { + billing_result = Some(settle_llm_router_usage( + &state, + owner_user_id.as_str(), + ).await); + if let Some(Err(error)) = billing_result.as_ref() { + tracing::error!( + request_id = %request_id, + user_id = %owner_user_id, + error = %error, + "LLM Router 流式响应已完成但累计额度同步未完成" + ); + } + } + yield Ok(Bytes::from(raw_event)); + } + } + Err(error) => { + if billing_result.is_none() { + if let Err(billing_error) = settle_llm_router_usage( + &state, + owner_user_id.as_str(), + ) + .await + { + tracing::error!( + request_id = %request_id, + user_id = %owner_user_id, + error = %billing_error, + "LLM Router 流式响应中断且累计额度同步未完成" + ); + } + } + yield Err(std::io::Error::other(format!( + "LLM Router 响应流读取失败：{error}" + ))); + return; + } + } + } + if !pending.is_empty() { + yield Ok(Bytes::from(pending)); + } + } +} + fn append_utf8_chunk(pending: &mut String, carry: &mut Vec, bytes: &[u8]) { carry.extend_from_slice(bytes); loop { @@ -1082,6 +1385,21 @@ fn map_chat_message(message: LlmChatMessagePayload) -> LlmMessage { LlmMessage::new(role, message.content) } +/// Composes the Router endpoint for one protocol operation. +/// +/// The account credential stored for the AGC official route is a bare gateway +/// base: it must not carry the version segment or the operation path, so the +/// protocol composes `v1/` itself. Historical rows still store a +/// trailing `/v1`, so it is normalised away first instead of being duplicated. +fn router_protocol_url(base_url: &str, operation: &str) -> String { + let base = base_url.trim().trim_end_matches('/'); + let base = base + .strip_suffix("/v1") + .unwrap_or(base) + .trim_end_matches('/'); + format!("{base}/v1/{operation}") +} + fn llm_error_response(request_context: &RequestContext, error: AppError) -> Response { error.into_response_with_context(Some(request_context)) } @@ -1387,7 +1705,8 @@ mod tests { .expect("captured request lock") .clone() .expect("mock server should capture upstream request"); - assert!(upstream_request.starts_with("POST /responses HTTP/1.1")); + // baseUrl 不带路由与版本段，Responses 由协议自己拼 `v1/responses`。 + assert!(upstream_request.starts_with("POST /v1/responses HTTP/1.1")); assert!( upstream_request .lines() @@ -1657,6 +1976,145 @@ mod tests { assert!(carry.is_empty()); } + #[test] + fn router_protocol_url_composes_v1_without_duplicating_it() { + // baseUrl 不带路由与版本段，协议自己拼。 + assert_eq!( + router_protocol_url("https://router.example", "messages"), + "https://router.example/v1/messages" + ); + assert_eq!( + router_protocol_url("https://router.example", "responses"), + "https://router.example/v1/responses" + ); + // 历史凭据里带着 `/v1`，归一化掉而不是拼成 `/v1/v1/...`。 + assert_eq!( + router_protocol_url("https://router.example/v1", "messages"), + "https://router.example/v1/messages" + ); + assert_eq!( + router_protocol_url("https://router.example/v1/", "chat/completions"), + "https://router.example/v1/chat/completions" + ); + } + + #[tokio::test] + async fn llm_v1_responses_route_reaches_the_router_v1_path() { + let (server_url, captured) = spawn_capturing_mock_server(MockResponse { + status_line: "200 OK", + content_type: "application/json; charset=utf-8", + body: r#"{"id":"resp_v1_01","status":"completed","output":[]}"#.to_string(), + extra_headers: Vec::new(), + }); + let (state, user_id) = seed_authenticated_state(AppConfig { + llm_router_base_url: server_url.clone(), + ..AppConfig::default() + }) + .await; + install_test_provisioned_router_credential(&user_id, server_url, "router-key"); + let token = issue_access_token(&state, &user_id); + let app = build_router(state); + + let response = app + .oneshot( + Request::builder() + .method("POST") + .uri("/api/llm/v1/responses") + .header("authorization", format!("Bearer {token}")) + .header("content-type", "application/json") + .header("x-genarrative-response-envelope", "v1") + .body(Body::from( + json!({ "input": [{ "role": "user", "content": "ping" }] }).to_string(), + )) + .expect("request should build"), + ) + .await + .expect("request should succeed"); + + assert_eq!(response.status(), StatusCode::OK); + let captured_request = captured + .lock() + .expect("captured request lock should not poison") + .clone() + .expect("upstream request should be captured"); + assert!( + captured_request + .to_ascii_lowercase() + .starts_with("post /v1/responses"), + "canonical v1 route must reach the Router v1 path: {captured_request}" + ); + } + + #[tokio::test] + async fn llm_anthropic_messages_uses_account_router_credential() { + let (server_url, captured) = spawn_capturing_mock_server(MockResponse { + status_line: "200 OK", + content_type: "application/json; charset=utf-8", + body: r#"{"id":"msg_api_server_01","type":"message","role":"assistant","content":[{"type":"text","text":"pong"}]}"#.to_string(), + extra_headers: Vec::new(), + }); + let (state, user_id) = seed_authenticated_state(AppConfig { + llm_router_base_url: server_url.clone(), + ..AppConfig::default() + }) + .await; + install_test_provisioned_router_credential(&user_id, server_url, "router-key"); + let token = issue_access_token(&state, &user_id); + let app = build_router(state); + + let response = app + .oneshot( + Request::builder() + .method("POST") + .uri("/api/llm/anthropic/v1/messages") + .header("authorization", format!("Bearer {token}")) + .header("content-type", "application/json") + .header("anthropic-version", "2023-06-01") + .header("x-genarrative-client", "agc") + .body(Body::from( + json!({ + "max_tokens": 16, + "messages": [{ "role": "user", "content": "ping" }] + }) + .to_string(), + )) + .expect("request should build"), + ) + .await + .expect("request should succeed"); + + assert_eq!(response.status(), StatusCode::OK); + let body = response + .into_body() + .collect() + .await + .expect("body should collect") + .to_bytes(); + assert!( + String::from_utf8_lossy(&body).contains("msg_api_server_01"), + "anthropic payload should pass through" + ); + + let captured_request = captured + .lock() + .expect("captured request lock should not poison") + .clone() + .expect("upstream request should be captured"); + let head = captured_request.to_ascii_lowercase(); + assert!( + head.starts_with("post /v1/messages"), + "upstream must receive the Anthropic path: {captured_request}" + ); + assert!( + head.contains("x-api-key: router-key"), + "upstream must receive the account Router key: {captured_request}" + ); + assert!( + !head.contains(&token.to_ascii_lowercase()), + "platform access token must never reach the Router" + ); + } + fn spawn_mock_server(responses: Vec) -> String { let listener = TcpListener::bind("127.0.0.1:0").expect("listener should bind"); let address = listener.local_addr().expect("listener should have addr"); diff --git a/server-rs/crates/api-server/src/modules/platform.rs b/server-rs/crates/api-server/src/modules/platform.rs index d457b795e..4cfbda348 100644 --- a/server-rs/crates/api-server/src/modules/platform.rs +++ b/server-rs/crates/api-server/src/modules/platform.rs @@ -9,7 +9,7 @@ use crate::{ auth::require_bearer_auth, llm::{ LLM_REQUEST_MAX_BODY_BYTES, list_llm_models, proxy_llm_chat_completions, - proxy_llm_responses, + proxy_llm_messages, proxy_llm_responses, }, state::AppState, volcengine_speech::{ @@ -36,6 +36,15 @@ pub fn router(state: AppState) -> Router { )) .layer(DefaultBodyLimit::max(LLM_REQUEST_MAX_BODY_BYTES)), ) + .route( + "/api/llm/v1/chat/completions", + post(proxy_llm_chat_completions) + .route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )) + .layer(DefaultBodyLimit::max(LLM_REQUEST_MAX_BODY_BYTES)), + ) .route( "/api/llm/responses", post(proxy_llm_responses) @@ -45,6 +54,27 @@ pub fn router(state: AppState) -> Router { )) .layer(DefaultBodyLimit::max(LLM_REQUEST_MAX_BODY_BYTES)), ) + .route( + "/api/llm/v1/responses", + post(proxy_llm_responses) + .route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )) + .layer(DefaultBodyLimit::max(LLM_REQUEST_MAX_BODY_BYTES)), + ) + // Anthropic 客户端（Claude Agent SDK / Claude Code CLI）固定请求 + // `{ANTHROPIC_BASE_URL}/v1/messages`，所以这里只声明 Anthropic 自己的 + // 路由前缀，尾段交给上游协议本身，网关不自己发明版本段。 + .route( + "/api/llm/anthropic/{*path}", + post(proxy_llm_messages) + .route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )) + .layer(DefaultBodyLimit::max(LLM_REQUEST_MAX_BODY_BYTES)), + ) .route( "/api/speech/volcengine/config", get(get_volcengine_speech_config).route_layer(middleware::from_fn_with_state( diff --git a/server-rs/crates/api-server/src/tracking.rs b/server-rs/crates/api-server/src/tracking.rs index 9a02ec3ea..ee48803b9 100644 --- a/server-rs/crates/api-server/src/tracking.rs +++ b/server-rs/crates/api-server/src/tracking.rs @@ -602,6 +602,15 @@ fn resolve_route_tracking_spec(method: &Method, path: &str) -> Option Some(route_spec("llm_request", "llm", User, "anonymous")), + ("POST", "/api/llm/v1/responses") => { + Some(route_spec("llm_request", "llm", User, "anonymous")) + } + ("POST", "/api/llm/v1/chat/completions") => { + Some(route_spec("llm_request", "llm", User, "anonymous")) + } + ("POST", "/api/llm/anthropic/v1/messages") => { + Some(route_spec("llm_request", "llm", User, "anonymous")) + } ("GET", "/api/speech/volcengine/config") => Some(route_spec( "speech_config_view", "speech", @@ -946,6 +955,7 @@ fn is_known_static_route_segment(segment: &str) -> bool { matches!( segment, "ai" | "analytics" + | "anthropic" | "api" | "api-keys" | "asr" @@ -988,11 +998,13 @@ fn is_known_static_route_segment(segment: &str) -> bool { | "library" | "llm" | "login" + | "messages" | "optimizations" | "login-options" | "logout" | "logout-all" | "me" + | "responses" | "metric" | "objects" | "orders" @@ -1616,6 +1628,35 @@ mod tests { ); } + #[test] + fn llm_gateway_protocol_paths_keep_their_tracking_specs() { + // 协议路径段必须保持静态，否则归一化会把 Anthropic 路由打成 + // `/api/llm/{id}/v1/{id}`，埋点永远匹配不上。 + assert_eq!( + normalize_route_path("/api/llm/anthropic/v1/messages"), + "/api/llm/anthropic/v1/messages" + ); + assert_eq!( + normalize_route_path("/api/llm/v1/responses"), + "/api/llm/v1/responses" + ); + assert_eq!( + normalize_route_path("/api/llm/v1/chat/completions"), + "/api/llm/v1/chat/completions" + ); + + for path in [ + "/api/llm/v1/responses", + "/api/llm/v1/chat/completions", + "/api/llm/anthropic/v1/messages", + ] { + let spec = resolve_route_tracking_spec(&Method::POST, path) + .unwrap_or_else(|| panic!("{path} should keep the llm_request spec")); + assert_eq!(spec.event_key, "llm_request"); + assert_eq!(spec.module_key, "llm"); + } + } + #[test] fn active_runtime_settings_routes_keep_tracking_specs() { for (method, event_key) in [ diff --git a/server-rs/crates/module-runtime/src/agc_models.rs b/server-rs/crates/module-runtime/src/agc_models.rs index 16cb030a8..e4ff1c5fb 100644 --- a/server-rs/crates/module-runtime/src/agc_models.rs +++ b/server-rs/crates/module-runtime/src/agc_models.rs @@ -17,6 +17,9 @@ pub const AGC_MODEL_CATALOG_MAX_MODELS: usize = 32; pub enum AgcAgentMode { Codex, Cc, + /// 显式 Anthropic Messages 协议。`cc` 是同一执行器的历史别名， + /// 新目录项应直接写 `anthropic`。 + Anthropic, } impl Default for AgcAgentMode { @@ -30,6 +33,7 @@ impl AgcAgentMode { match self { Self::Codex => "codex", Self::Cc => "cc", + Self::Anthropic => "anthropic", } } @@ -37,7 +41,8 @@ impl AgcAgentMode { match value { "codex" => Ok(Self::Codex), "cc" => Ok(Self::Cc), - _ => Err("Agent 模式只允许 codex 或 cc".into()), + "anthropic" => Ok(Self::Anthropic), + _ => Err("Agent 模式只允许 codex、cc 或 anthropic".into()), } } } @@ -340,13 +345,21 @@ mod tests { } #[test] - fn catalog_agent_mode_accepts_codex_and_cc_only() { + fn catalog_agent_mode_accepts_codex_cc_and_anthropic_only() { let mut catalog = AgcModelCatalog::from_upstream_models(upstream(&["model-a", "model-b"]), 0).unwrap(); catalog.models[0].agent_mode = AgcAgentMode::Cc; assert!(catalog.validate().is_ok()); assert_eq!(catalog.models[0].agent_mode.as_str(), "cc"); + catalog.models[0].agent_mode = AgcAgentMode::Anthropic; + assert!(catalog.validate().is_ok()); + assert_eq!(catalog.models[0].agent_mode.as_str(), "anthropic"); + assert_eq!( + AgcAgentMode::parse("anthropic").unwrap(), + AgcAgentMode::Anthropic + ); + let invalid: Result = serde_json::from_str( r#"{"revision":0,"defaultModelId":"model-a","models":[{"id":"model-a","alias":"model-a","modelId":"model-a","enabled":true,"agentMode":"provider"}]}"#, ); diff --git a/src/components/platform-entry/PlatformActiveProfileView.test.tsx b/src/components/platform-entry/PlatformActiveProfileView.test.tsx index 080996f2d..acf9d4934 100644 --- a/src/components/platform-entry/PlatformActiveProfileView.test.tsx +++ b/src/components/platform-entry/PlatformActiveProfileView.test.tsx @@ -18,6 +18,7 @@ const callbacks = { onOpenApiKeys: vi.fn(), onOpenCommunity: vi.fn(), onOpenFeedback: vi.fn(), + onOpenInvite: vi.fn(), onOpenRecharge: vi.fn(), onOpenRewardCode: vi.fn(), onOpenSettings: vi.fn(), @@ -90,6 +91,7 @@ describe('PlatformActiveProfileView', () => { expect(screen.getByText(/陶泥号：\s*100001/u)).toBeTruthy(); expect(screen.getByRole('button', { name: '泥点余额 108' })).toBeTruthy(); expect(screen.getByRole('button', { name: /泥点充值/u })).toBeTruthy(); + expect(screen.getByRole('button', { name: /邀请好友/u })).toBeTruthy(); expect(screen.getByRole('button', { name: /兑换码/u })).toBeTruthy(); expect(screen.getByRole('button', { name: /玩家社区/u })).toBeTruthy(); expect(screen.getByRole('button', { name: /反馈与建议/u })).toBeTruthy(); @@ -98,6 +100,9 @@ describe('PlatformActiveProfileView', () => { screen.getByRole('button', { name: /开发者 API Key/u }), ).toBeTruthy(); + fireEvent.click(screen.getByRole('button', { name: /邀请好友/u })); + expect(callbacks.onOpenInvite).toHaveBeenCalledTimes(1); + fireEvent.click(screen.getByRole('button', { name: '用户协议' })); const legalDialog = screen.getByRole('dialog', { name: '用户协议' }); expect(legalDialog.parentElement?.className).toContain( diff --git a/src/components/platform-entry/PlatformActiveProfileView.tsx b/src/components/platform-entry/PlatformActiveProfileView.tsx index 8c5c39e74..8b431a2aa 100644 --- a/src/components/platform-entry/PlatformActiveProfileView.tsx +++ b/src/components/platform-entry/PlatformActiveProfileView.tsx @@ -7,6 +7,7 @@ import { Pencil, Settings, Ticket, + UserPlus, UserRound, } from 'lucide-react'; import { useCallback, useRef, useState } from 'react'; @@ -21,6 +22,7 @@ import profileClockImage from '../../../media/profile/_Image (1).png'; import profileGamepadImage from '../../../media/profile/_Image (2).png'; import profileStillLifeImage from '../../../media/profile/_Image (3).png'; import profileCoinsImage from '../../../media/profile/_Image (4).png'; +import profileInviteImage from '../../../media/profile/_Image (5).png'; import profileGiftImage from '../../../media/profile/_Image (6).png'; import profileCommunityImage from '../../../media/profile/_Image (7).png'; import profileFeedbackImage from '../../../media/profile/_Image (8).png'; @@ -69,6 +71,7 @@ type PlatformActiveProfileViewProps = { onOpenApiKeys: () => void; onOpenCommunity: () => void; onOpenFeedback: () => void; + onOpenInvite: () => void; onOpenRecharge: () => void; onOpenRewardCode: () => void; onOpenSettings: () => void; @@ -278,6 +281,7 @@ export function PlatformActiveProfileView({ onOpenApiKeys, onOpenCommunity, onOpenFeedback, + onOpenInvite, onOpenRecharge, onOpenRewardCode, onOpenSettings, @@ -606,7 +610,7 @@ export function PlatformActiveProfileView({ className="platform-profile-shortcut-panel" aria-label="常用功能" > -
+
+ { + void readNativeHostClipboardText().then((text) => { + if (text) { + profileCenter.setReferralRedeemCode(text); + } + }); + }, [profileCenter]); + const isMobileToolStage = !isDesktopLayout && (selectionStage === 'creation-home' || @@ -766,6 +784,9 @@ export function PlatformEntryFlowShellImpl({ profileCenter.openProfilePopupPanel('community') } onOpenFeedback={openFeedback} + onOpenInvite={() => + profileCenter.openProfilePopupPanel('invite') + } onOpenRecharge={openRecharge} onOpenRewardCode={profileCenter.openRewardCodeModal} onOpenSettings={() => authUi?.openSettingsModal()} @@ -870,14 +891,19 @@ export function PlatformEntryFlowShellImpl({ diff --git a/src/components/platform-entry/PlatformProfileReferralModal.test.tsx b/src/components/platform-entry/PlatformProfileReferralModal.test.tsx deleted file mode 100644 index d674c2b88..000000000 --- a/src/components/platform-entry/PlatformProfileReferralModal.test.tsx +++ /dev/null @@ -1,172 +0,0 @@ -/* @vitest-environment jsdom */ - -import { render, screen, within } from '@testing-library/react'; -import userEvent from '@testing-library/user-event'; -import { afterEach, describe, expect, test, vi } from 'vitest'; - -import type { ProfileReferralInviteCenterResponse } from '../../../packages/shared/src/contracts/runtime'; -import { - canPasteFromNativeHostClipboard, - readNativeHostClipboardText, -} from './platformProfileHostClipboard'; -import { PlatformProfileReferralModal } from './PlatformProfileReferralModal'; - -vi.mock('./platformProfileHostClipboard', () => ({ - canPasteFromNativeHostClipboard: vi.fn(() => false), - readNativeHostClipboardText: vi.fn(), -})); - -const canPasteFromNativeHostClipboardMock = vi.mocked( - canPasteFromNativeHostClipboard, -); -const readNativeHostClipboardTextMock = vi.mocked(readNativeHostClipboardText); - -function buildCenter( - overrides: Partial = {}, -): ProfileReferralInviteCenterResponse { - return { - inviteCode: 'ABCD1234', - inviteLinkPath: '/invite/ABCD1234', - invitedCount: 1, - rewardedInviteCount: 1, - todayInviterRewardCount: 1, - todayInviterRewardRemaining: 9, - rewardPoints: 66, - invitedUsers: [ - { - userId: 'user-2', - displayName: '海盐', - avatarUrl: null, - boundAt: '2026-06-10T08:00:00.000Z', - }, - ], - hasRedeemedCode: false, - boundInviterUserId: null, - boundAt: null, - updatedAt: '2026-06-10T08:00:00.000Z', - ...overrides, - }; -} - -describe('PlatformProfileReferralModal', () => { - afterEach(() => { - vi.clearAllMocks(); - canPasteFromNativeHostClipboardMock.mockReturnValue(false); - }); - - test('renders invite panel with shared profile content', () => { - render( - , - ); - - const dialog = screen.getByRole('dialog', { name: '邀请好友' }); - - expect(within(dialog).getByText('邀请码')).toBeTruthy(); - expect(within(dialog).getByText('ABCD1234')).toBeTruthy(); - expect(within(dialog).getByText('海盐')).toBeTruthy(); - expect(within(dialog).getByText('成功邀请')).toBeTruthy(); - expect( - within(dialog).getByRole('button', { name: /复制邀请/u }), - ).toBeTruthy(); - }); - - test('submits redeem panel with the shared form shell', async () => { - const user = userEvent.setup(); - const onRedeemCodeChange = vi.fn(); - const onSubmitRedeemCode = vi.fn(); - - render( - , - ); - - const dialog = screen.getByRole('dialog', { name: '填邀请码' }); - const input = within(dialog).getByRole('textbox', { name: '邀请码' }); - - await user.type(input, ' c'); - expect(onRedeemCodeChange).toHaveBeenCalled(); - - await user.click(within(dialog).getByRole('button', { name: '提交' })); - expect(onSubmitRedeemCode).toHaveBeenCalledTimes(1); - }); - - test('redeem panel can paste invite code from native host clipboard', async () => { - const user = userEvent.setup(); - const onRedeemCodeChange = vi.fn(); - canPasteFromNativeHostClipboardMock.mockReturnValue(true); - readNativeHostClipboardTextMock.mockResolvedValue('spring-2026'); - - render( - , - ); - - await user.click(screen.getByRole('button', { name: '粘贴' })); - - expect(readNativeHostClipboardTextMock).toHaveBeenCalledTimes(1); - expect(onRedeemCodeChange).toHaveBeenCalledWith('spring-2026'); - }); - - test('renders community QR panels', () => { - render( - , - ); - - const dialog = screen.getByRole('dialog', { name: '玩家社区' }); - - expect(within(dialog).getByAltText('玩家社区微信群二维码')).toBeTruthy(); - expect(within(dialog).getByAltText('玩家社区 QQ 群二维码')).toBeTruthy(); - expect(within(dialog).getByText('微信群')).toBeTruthy(); - expect(within(dialog).getByText('QQ群')).toBeTruthy(); - }); -}); diff --git a/src/components/platform-entry/PlatformProfileReferralModal.tsx b/src/components/platform-entry/PlatformProfileReferralModal.tsx deleted file mode 100644 index 0f5151148..000000000 --- a/src/components/platform-entry/PlatformProfileReferralModal.tsx +++ /dev/null @@ -1,343 +0,0 @@ -import { ClipboardPaste, Copy } from 'lucide-react'; -import type { ReactNode } from 'react'; - -import communityQqQrImage from '../../../media/social-media-group/qq.png'; -import communityWechatQrImage from '../../../media/social-media-group/wechat.png'; -import type { ProfileReferralInviteCenterResponse } from '../../../packages/shared/src/contracts/runtime'; -import { CopyFeedbackButton } from '../common/CopyFeedbackButton'; -import { PlatformActionButton } from '../common/PlatformActionButton'; -import { PlatformAsyncStatePanel } from '../common/PlatformAsyncStatePanel'; -import { PlatformEmptyState } from '../common/PlatformEmptyState'; -import { PlatformFieldLabel } from '../common/PlatformFieldLabel'; -import { PlatformProfileContentRow } from '../common/PlatformProfileContentRow'; -import { PlatformProfileSkeletonList } from '../common/PlatformProfileSkeletonList'; -import { PlatformStatusMessage } from '../common/PlatformStatusMessage'; -import { PlatformSubpanel } from '../common/PlatformSubpanel'; -import { PlatformTextField } from '../common/PlatformTextField'; -import type { CopyFeedbackState } from '../common/useCopyFeedback'; -import { - canPasteFromNativeHostClipboard, - readNativeHostClipboardText, -} from './platformProfileHostClipboard'; -import { PlatformProfileSecondaryModalShell } from './PlatformProfileModalShell'; -import type { ProfileReferralPanel } from './usePlatformProfileCenterController'; - -type PlatformProfileReferralModalProps = { - panel: ProfileReferralPanel; - center: ProfileReferralInviteCenterResponse | null; - isLoading: boolean; - isSubmittingRedeem: boolean; - redeemCode: string; - copyInviteState: CopyFeedbackState; - error: string | null; - success: string | null; - onClose: () => void; - onCopyInvite: () => void; - onRedeemCodeChange: (value: string) => void; - onSubmitRedeemCode: () => void; -}; - -const COMMUNITY_QR_CODES = [ - { - label: '微信群', - src: communityWechatQrImage, - alt: '玩家社区微信群二维码', - }, - { - label: 'QQ群', - src: communityQqQrImage, - alt: '玩家社区 QQ 群二维码', - }, -] as const; - -function ProfileReferralUserAvatar({ - name, - avatarUrl, -}: { - name: string; - avatarUrl: string | null; -}) { - const avatarLabel = (name.trim() || '玩').slice(0, 1).toUpperCase(); - - return ( - - {avatarUrl ? ( - - ) : ( - avatarLabel - )} - - ); -} - -function resolvePanelTitle(panel: ProfileReferralPanel) { - if (panel === 'invite') { - return '邀请好友'; - } - if (panel === 'redeem') { - return '填邀请码'; - } - return '玩家社区'; -} - -/** - * 个人中心邀请能力统一弹层。 - * 承接邀请码、填码和社区二维码三种 profile panel，避免首页继续内联重复白底浮层实现。 - */ -export function PlatformProfileReferralModal({ - panel, - center, - isLoading, - isSubmittingRedeem, - redeemCode, - copyInviteState, - error, - success, - onClose, - onCopyInvite, - onRedeemCodeChange, - onSubmitRedeemCode, -}: PlatformProfileReferralModalProps) { - const title = resolvePanelTitle(panel); - const normalizedRedeemCode = redeemCode - .trim() - .replace(/[^0-9a-z]/gi, '') - .toUpperCase(); - const canPasteRedeemCode = canPasteFromNativeHostClipboard(); - const pasteRedeemCode = () => { - void readNativeHostClipboardText().then((text) => { - if (text) { - onRedeemCodeChange(text); - } - }); - }; - - let content: ReactNode; - - if (panel === 'community') { - content = ( -
- {COMMUNITY_QR_CODES.map((qrCode) => ( - -
- {qrCode.alt} -
-
- {qrCode.label} -
- - ))} -
- ); - } else if (panel === 'redeem') { - content = ( - - } - isEmpty={Boolean(center?.hasRedeemedCode)} - emptyState={ - - 已填写邀请码 - - } - > -
{ - event.preventDefault(); - onSubmitRedeemCode(); - }} - > - onRedeemCodeChange(event.target.value)} - size="lg" - density="roomy" - tone="rose" - className="rounded-xl text-center font-black uppercase tracking-[0.16em]" - placeholder="邀请码" - aria-label="邀请码" - autoComplete="off" - autoFocus - /> - {canPasteRedeemCode ? ( - - - 粘贴 - - ) : null} - - {isSubmittingRedeem ? '提交中' : '提交'} - - -
- ); - } else { - content = ( - - } - > -
- - - 邀请码 - -
- {center?.inviteCode ?? '--------'} -
- - -
- {`邀请一个用户注册，双方都可以获得${center?.rewardPoints ?? 30}泥点。`} -
-
每日最多获得十次邀请奖励。
- - } - actionSurface="profile" - actionSize="md" - actionFullWidth - className="gap-2 rounded-xl" - /> - - - 成功邀请 - - {center?.invitedUsers?.length ? ( -
- {center.invitedUsers.map((user) => ( - - -
-
- {user.displayName || '玩家'} -
-
- - ))} -
- ) : ( - - 暂无成功邀请 - - )} - -
- - ); - } - - return ( - -
{title}
- {content} - - {error ? ( - - {error} - - ) : null} - {success ? ( - - {success} - - ) : null} - - ); -} diff --git a/src/components/platform-entry/usePlatformProfileCenterController.redemption.test.tsx b/src/components/platform-entry/usePlatformProfileCenterController.redemption.test.tsx index dbbb10029..2ec27ed59 100644 --- a/src/components/platform-entry/usePlatformProfileCenterController.redemption.test.tsx +++ b/src/components/platform-entry/usePlatformProfileCenterController.redemption.test.tsx @@ -11,11 +11,62 @@ import { userB, } from './usePlatformProfileCenterController.testSupport'; +const clipboardMock = vi.hoisted(() => ({ + copyTextToClipboard: vi.fn(async () => true), +})); + +vi.mock('../../services/clipboard', () => clipboardMock); + describe('usePlatformProfileCenterController redemption lifecycle', () => { beforeEach(() => { window.history.replaceState(null, '', '/profile'); usePlatformWalletStore.getState().resetWalletBalance(); vi.clearAllMocks(); + clipboardMock.copyTextToClipboard.mockResolvedValue(true); + }); + + test('copies the invite link and the invite code as separate actions', async () => { + profileClientMocks.getPlatformProfileReferralInviteCenter.mockResolvedValue( + { + inviteCode: 'USER-A', + inviteLinkPath: '/?inviteCode=USER-A', + invitedCount: 0, + rewardedInviteCount: 0, + todayInviterRewardCount: 0, + todayInviterRewardRemaining: 10, + rewardPoints: 30, + invitedUsers: [], + hasRedeemedCode: false, + boundInviterUserId: null, + boundAt: null, + updatedAt: '2026-10-01T00:00:00.000Z', + }, + ); + const expectedInviteLink = `${window.location.origin}/?inviteCode=USER-A`; + const { result } = renderController(userA); + + await act(async () => { + result.current.openProfilePopupPanel('invite'); + }); + + expect(result.current.profilePopupPanel).toBe('invite'); + expect(result.current.inviteLinkUrl).toBe(expectedInviteLink); + + await act(async () => { + result.current.copyInviteLink(); + }); + expect(clipboardMock.copyTextToClipboard).toHaveBeenLastCalledWith( + expectedInviteLink, + ); + expect(result.current.referralSuccess).toBe('邀请链接已复制'); + + await act(async () => { + result.current.copyInviteCode(); + }); + expect(clipboardMock.copyTextToClipboard).toHaveBeenLastCalledWith( + 'USER-A', + ); + expect(result.current.referralSuccess).toBe('邀请码已复制'); }); test('ignores a reward-code response after the account changes', async () => { diff --git a/src/components/platform-entry/usePlatformProfileCenterController.ts b/src/components/platform-entry/usePlatformProfileCenterController.ts index 03a5f423d..208eaccd7 100644 --- a/src/components/platform-entry/usePlatformProfileCenterController.ts +++ b/src/components/platform-entry/usePlatformProfileCenterController.ts @@ -422,7 +422,9 @@ export function usePlatformProfileCenterController({ useState(false); const [referralError, setReferralError] = useState(null); const [referralSuccess, setReferralSuccess] = useState(null); - const { copyState: inviteCopyState, copyText: copyInviteText } = + const { copyState: inviteLinkCopyState, copyText: copyInviteLinkText } = + useCopyFeedback(); + const { copyState: inviteCodeCopyState, copyText: copyInviteCodeText } = useCopyFeedback(); const pendingWechatRechargeOrderRef = useRef(null); @@ -1701,21 +1703,43 @@ export function usePlatformProfileCenterController({ setProfilePopupPanel(null); }, []); - const copyInviteInfo = useCallback(() => { - if (!referralCenter?.inviteCode) { + /** + * 邀请链接是分享给好友的正式入口（好友打开后自动带上邀请码）， + * 因此这里只用站点 origin 补全后端返回的相对路径。 + */ + const inviteLinkUrl = useMemo(() => { + const inviteLinkPath = referralCenter?.inviteLinkPath; + if (!inviteLinkPath) { + return null; + } + if (typeof window === 'undefined') { + return inviteLinkPath; + } + try { + return new URL(inviteLinkPath, window.location.origin).href; + } catch { + return inviteLinkPath; + } + }, [referralCenter]); + + const copyInviteLink = useCallback(() => { + if (!inviteLinkUrl) { return; } + void copyInviteLinkText(inviteLinkUrl).then((copied) => { + setReferralSuccess(copied ? '邀请链接已复制' : '复制失败'); + }); + }, [copyInviteLinkText, inviteLinkUrl]); - const inviteUrl = - typeof window === 'undefined' - ? referralCenter.inviteLinkPath - : new URL(referralCenter.inviteLinkPath, window.location.origin).href; - void copyInviteText(`${referralCenter.inviteCode} ${inviteUrl}`).then( - (copied) => { - setReferralSuccess(copied ? '已复制' : '复制失败'); - }, - ); - }, [copyInviteText, referralCenter]); + const copyInviteCode = useCallback(() => { + const inviteCode = referralCenter?.inviteCode; + if (!inviteCode) { + return; + } + void copyInviteCodeText(inviteCode).then((copied) => { + setReferralSuccess(copied ? '邀请码已复制' : '复制失败'); + }); + }, [copyInviteCodeText, referralCenter]); const submitReferralRedeemCode = useCallback(() => { const inviteCode = referralRedeemCode @@ -1850,7 +1874,10 @@ export function usePlatformProfileCenterController({ closeNativeWechatPayment, closeProfilePopupPanel, confirmNativeWechatPayment, - inviteCopyState: inviteCopyState as CopyFeedbackState, + copyInviteCode, + inviteCodeCopyState: inviteCodeCopyState as CopyFeedbackState, + inviteLinkCopyState: inviteLinkCopyState as CopyFeedbackState, + inviteLinkUrl, isLoadingRechargeCenter, isLoadingReferral, isLoadingWalletLedger, @@ -1892,6 +1919,6 @@ export function usePlatformProfileCenterController({ walletLedgerError, wechatRechargeOrderConfirmationState, buyRechargeProduct, - copyInviteInfo, + copyInviteLink, }; } diff --git a/vite.config.ts b/vite.config.ts index 1210009a3..142f05851 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -190,7 +190,6 @@ const ACTIVE_TAILWIND_SOURCES = `@import 'tailwindcss' source(none); @source "./components/platform-entry/PlatformProfileApiKeysModal.tsx"; @source "./components/platform-entry/PlatformProfileModalShell.tsx"; @source "./components/platform-entry/PlatformProfileRechargeModal.tsx"; -@source "./components/platform-entry/PlatformProfileReferralModal.tsx"; @source "./components/platform-entry/PlatformProfileRewardCodeRedeemModal.tsx"; @source "./components/platform-entry/PlatformProfileWalletLedgerModal.tsx"; @source "./components/platform-entry/PlatformRechargePaymentStatusDialogs.tsx";