@jsonstudio/rcc 0.85.9 → 0.89.3

package/dist/modules/pipeline/modules/provider/v2/auth/oauth-lifecycle.js

@@ -1,446 +0,0 @@
-import { createProviderOAuthStrategy, getProviderOAuthConfig } from '../config/provider-oauth-configs.js';
-import { OAuthFlowType } from '../config/oauth-flows.js';
-import fs from 'fs/promises';
-import path from 'path';
-import { fetchIFlowUserInfo, mergeIFlowTokenData } from "./iflow-userinfo-helper.js";
-import { fetchQwenUserInfo, mergeQwenTokenData, hasQwenApiKey } from "./qwen-userinfo-helper.js";
-// Simple in-process locks to avoid concurrent interactive flows
-const inFlight = new Map();
-const lastRunAt = new Map();
-function keyFor(providerType, tokenFile) {
-    return `${providerType}::${tokenFile || ''}`;
-}
-function expandHome(p) {
-    return p.startsWith('~/') ? p.replace(/^~\//, `${process.env.HOME || ''}/`) : p;
-}
-function defaultTokenFile(providerType) {
-    const home = process.env.HOME || '';
-    // 对齐 iFlow CLI 的默认位置
-    if (providerType === 'iflow') {
-        return path.join(home, '.iflow', 'oauth_creds.json');
-    }
-    // Qwen: 按配置体系约定，OAuth 凭证默认放在 ~/.routecodex/auth 目录
-    if (providerType === 'qwen') {
-        return path.join(home, '.routecodex', 'auth', 'qwen-oauth.json');
-    }
-    return path.join(home, '.routecodex', 'tokens', `${providerType}-default.json`);
-}
-function resolveTokenFilePath(auth, providerType) {
-    const tf = auth.tokenFile;
-    const resolved = tf && tf.trim() ? expandHome(tf.trim()) : defaultTokenFile(providerType);
-    // 将最终路径回写到配置中，确保 TokenFileAuthProvider / OAuthAuthProvider 等后续组件
-    // 使用同一份 tokenFile 设置，避免出现多处默认路径不一致的问题。
-    if (!tf || !tf.trim()) {
-        auth.tokenFile = resolved;
-    }
-    return resolved;
-}
-function shouldThrottle(k, ms = 60_000) {
-    const t = lastRunAt.get(k) || 0;
-    return Date.now() - t < ms;
-}
-export async function ensureValidOAuthToken(providerType, auth, opts = {}) {
-    // Non-oauth callers should not route here
-    if (!auth || typeof auth.type !== 'string' || !auth.type.toLowerCase().includes('oauth'))
-        return;
-    const tokenFilePath = resolveTokenFilePath(auth, providerType);
-    const k = keyFor(providerType, tokenFilePath);
-    if (inFlight.has(k)) {
-        await inFlight.get(k);
-        return;
-    }
-    if (shouldThrottle(k))
-        return; // avoid excessive work
-    const openBrowser = opts.openBrowser ?? (String(process.env.ROUTECODEX_OAUTH_AUTO_OPEN || '1') === '1');
-    const forceReauth = opts.forceReauthorize === true || String(process.env.ROUTECODEX_OAUTH_FORCE_REAUTH || '0') === '1';
-    const p = (async () => {
-        try {
-            // 1) 构建策略（Provider默认配置 + 用户覆盖）
-            const defaults = getProviderOAuthConfig(providerType);
-            const ep = { ...(defaults?.endpoints || {}) };
-            if (auth.tokenUrl)
-                ep.tokenUrl = auth.tokenUrl;
-            if (auth.deviceCodeUrl)
-                ep.deviceCodeUrl = auth.deviceCodeUrl;
-            if (auth.authorizationUrl)
-                ep.authorizationUrl = auth.authorizationUrl;
-            if (auth.userInfoUrl)
-                ep.userInfoUrl = auth.userInfoUrl;
-            const client = { ...(defaults?.client || {}) };
-            if (auth.clientId)
-                client.clientId = auth.clientId;
-            if (auth.clientSecret)
-                client.clientSecret = auth.clientSecret;
-            if (Array.isArray(auth.scopes))
-                client.scopes = auth.scopes;
-            if (auth.redirectUri)
-                client.redirectUri = auth.redirectUri;
-            // iflow: 允许通过环境变量或捕获的 CLI 日志自动注入 clientId/secret（避免硬编码）
-            if (providerType === 'iflow') {
-                try {
-                    const envId = process.env.IFLOW_CLIENT_ID?.trim();
-                    const envSecret = process.env.IFLOW_CLIENT_SECRET?.trim();
-                    if (envId)
-                        client.clientId = envId;
-                    if (envSecret)
-                        client.clientSecret = envSecret;
-                    if (!client.clientSecret || !client.clientId) {
-                        const inferred = await inferIflowClientCredsFromLog();
-                        if (inferred?.clientId && !client.clientId)
-                            client.clientId = inferred.clientId;
-                        if (inferred?.clientSecret && !client.clientSecret)
-                            client.clientSecret = inferred.clientSecret;
-                    }
-                }
-                catch { /* ignore */ }
-            }
-            // iFlow 头部（使用配置中的标准OAuth端点，不再需要端点修正）
-            const enforcedHeaders = (providerType === 'iflow') ? {
-                'User-Agent': 'iflow-cli/2.0',
-                'X-Requested-With': 'XMLHttpRequest',
-                'Origin': 'https://iflow.cn',
-                'Referer': 'https://iflow.cn/oauth',
-                'Accept': 'application/json'
-            } : {};
-            const overrides = {
-                activationType: openBrowser ? 'auto_browser' : 'manual',
-                endpoints: ep,
-                client,
-                tokenFile: tokenFilePath,
-                headers: { ...(defaults?.headers || {}), ...enforcedHeaders }
-            };
-            const strat = createProviderOAuthStrategy(providerType, overrides, tokenFilePath);
-            // 基础日志
-            try {
-                console.log(`[OAuth] ensureValid: provider=${providerType} flow=${String(defaults?.flowType || 'unknown')} activation=${String(overrides.activationType)} tokenFile=${tokenFilePath} openBrowser=${openBrowser} forceReauth=${forceReauth}`);
-                if (ep?.deviceCodeUrl || ep?.authorizationUrl) {
-                    console.log(`[OAuth] endpoints: deviceCodeUrl=${String(ep.deviceCodeUrl || '')} tokenUrl=${String(ep.tokenUrl || '')} authUrl=${String(ep.authorizationUrl || '')} userInfoUrl=${String(ep.userInfoUrl || '')}`);
-                }
-                if (providerType === 'iflow') {
-                    console.log(`[OAuth] iflow client: id=${String(client.clientId || '(missing)')} secret=${client.clientSecret ? '(present)' : '(missing)'} redirect=${String(client.redirectUri || '(default)')}`);
-                }
-            }
-            catch { /* ignore logging errors */ }
-            // 2) 读取本地token，并判断有效性
-            const readLocalToken = async () => {
-                const tf = tokenFilePath;
-                const txt = await fs.readFile(tf, 'utf-8').catch(() => '');
-                if (!txt)
-                    return null;
-                try {
-                    const parsed = JSON.parse(txt);
-                    // 兼容 CLIProxyAPI 风格：若只存在 api_key，则补充 apiKey 便于后续统一处理
-                    if (parsed && typeof parsed.apiKey !== 'string' && typeof parsed.api_key === 'string') {
-                        parsed.apiKey = parsed.api_key;
-                    }
-                    return parsed;
-                }
-                catch {
-                    return null;
-                }
-            };
-            const token = await readLocalToken();
-            try {
-                const exists = !!token;
-                const hasApiKey0 = exists && (() => {
-                    const t = token;
-                    const k = (t.apiKey || t.api_key);
-                    return typeof k === 'string' && k.trim().length > 0;
-                })();
-                const hasAccess0 = exists && typeof token.access_token === 'string' && token.access_token.trim().length > 0;
-                const exp0Raw = exists ? (token.expires_at ?? token.expired ?? token.expiry_date) : null;
-                console.log(`[OAuth] token.read: exists=${exists} hasApiKey=${hasApiKey0} hasAccess=${hasAccess0} expRaw=${String(exp0Raw)}`);
-                if (providerType === 'iflow') {
-                    console.log(`[OAuth] strict endpoints: deviceCodeUrl=${String(ep.deviceCodeUrl)} tokenUrl=${String(ep.tokenUrl)}`);
-                }
-            }
-            catch { /* ignore logging errors */ }
-            const getExpiresAt = (t) => {
-                if (!t)
-                    return null;
-                const raw = (t.expires_at ?? t.expired ?? t.expiry_date);
-                if (typeof raw === 'number')
-                    return raw;
-                if (typeof raw === 'string') {
-                    const ts = Date.parse(raw);
-                    return Number.isFinite(ts) ? ts : null;
-                }
-                return null;
-            };
-            const now = Date.now();
-            const exp = getExpiresAt(token);
-            const hasApiKey = !!(token && (() => {
-                const t = token;
-                const k = (t.apiKey || t.api_key);
-                return typeof k === 'string' && k.trim().length > 0;
-            })());
-            const hasAccess = token && typeof token.access_token === 'string' && token.access_token.trim().length > 0;
-            const provider = String(providerType || '').toLowerCase();
-            // 令牌是否已过期（或接近过期，留 60s 缓冲）
-            const skewMs = 60_000;
-            const isExpiredOrNear = (() => {
-                if (exp == null)
-                    return false;
-                return now >= (exp - skewMs);
-            })();
-            // 判断是否可直接复用本地令牌：
-            // - iflow：必须有 apiKey，且不过期；缺少 apiKey 时走设备码流并交换 apiKey
-            // - qwen：access_token + 未过期 即视为有效，不强制要求 apiKey（access_token 就是主要凭证）
-            // - 其他：优先 apiKey，其次 access_token，只要不过期即可
-            let validAccess = false;
-            if (provider === 'iflow') {
-                // once apiKey is captured, continue using it even if OAuth token metadata is stale
-                validAccess = hasApiKey || (!isExpiredOrNear && hasAccess);
-            }
-            else if (provider === 'qwen') {
-                validAccess = (hasApiKey || hasAccess) && !isExpiredOrNear;
-            }
-            else {
-                validAccess = (hasApiKey || hasAccess) && !isExpiredOrNear;
-            }
-            // iFlow 特例：若缺少 apiKey，尝试用现有 access_token 获取 apiKey 后再保存
-            // 不做预先 enrichment；缺少 apiKey 必须走设备码授权，一次性获取并保存
-            if (!forceReauth && validAccess) {
-                console.log(`[OAuth] Using existing token (${hasApiKey ? 'apiKey' : 'access_token'} valid). No authorization required.`);
-                lastRunAt.set(k, Date.now());
-                return;
-            }
-            // 3) 近过期/已过期：优先刷新；失败且允许时才走交互授权
-            if (!forceReauth && isExpiredOrNear && token?.refresh_token && typeof strat.refreshToken === 'function') {
-                try {
-                    console.log('[OAuth] refreshing token...');
-                    const refreshed = await strat.refreshToken(token.refresh_token);
-                    if (typeof strat.saveToken === 'function') {
-                        await strat.saveToken(refreshed);
-                        console.log(`[OAuth] Token refreshed and saved: ${tokenFilePath}`);
-                    }
-                    lastRunAt.set(k, Date.now());
-                    return;
-                }
-                catch (e) {
-                    if (opts.forceReacquireIfRefreshFails) {
-                        console.log('[OAuth] refresh failed, attempting interactive authorization...');
-                        const authed = await strat.authenticate({ openBrowser });
-                        if (typeof strat.saveToken === 'function' && authed) {
-                            await strat.saveToken(authed);
-                            console.log(`[OAuth] Token acquired and saved: ${tokenFilePath}`);
-                            // iFlow专用：获取API Key并更新token文件
-                            if (providerType === "iflow") {
-                                try {
-                                    console.log("[OAuth] iFlow detected, fetching API Key via getUserInfo...");
-                                    // 从认证结果中获取access_token
-                                    const accessToken = authed.access_token || authed.AccessToken;
-                                    if (!accessToken) {
-                                        console.warn("[OAuth] iFlow: no access_token found in auth result, skipping API Key fetch");
-                                    }
-                                    else {
-                                        // 调用getUserInfo获取API Key
-                                        const userInfo = await fetchIFlowUserInfo(accessToken);
-                                        console.log(`[OAuth] iFlow: successfully fetched API Key for ${userInfo.email}`);
-                                        // 合并OAuth token和API Key数据
-                                        const mergedToken = mergeIFlowTokenData(authed, userInfo);
-                                        // 重新保存包含API Key的完整token数据
-                                        await strat.saveToken(mergedToken);
-                                        console.log(`[OAuth] iFlow: API Key saved to token file`);
-                                    }
-                                }
-                                catch (error) {
-                                    console.error(`[OAuth] iFlow: failed to fetch API Key - ${error instanceof Error ? error.message : String(error)}`);
-                                    // 不中断主流程，继续使用原始token
-                                }
-                            }
-                        }
-                        lastRunAt.set(k, Date.now());
-                        return;
-                    }
-                    throw e;
-                }
-            }
-            // 4) 无token或不可刷新：进行交互式授权（对齐老方式：iflow 优先授权码，失败再设备码）
-            console.log('[OAuth] starting interactive authorization flow...');
-            if (providerType === 'iflow') {
-                // 4.1 授权码优先
-                try {
-                    const authCodeStrat = createProviderOAuthStrategy(providerType, { ...overrides, flowType: OAuthFlowType.AUTHORIZATION_CODE }, tokenFilePath);
-                    const authed = await authCodeStrat.authenticate({ openBrowser: true });
-                    if (typeof authCodeStrat.saveToken === 'function' && authed) {
-                        await authCodeStrat.saveToken(authed);
-                        console.log(`[OAuth] Token acquired (auth_code) and saved: ${tokenFilePath}`);
-                    }
-                    lastRunAt.set(k, Date.now());
-                    // iFlow专用：获取API Key并更新token文件
-                    if (providerType === "iflow") {
-                        try {
-                            console.log("[OAuth] iFlow detected, fetching API Key via getUserInfo...");
-                            // 从认证结果中获取access_token
-                            const accessToken = authed.access_token || authed.AccessToken;
-                            if (!accessToken) {
-                                console.warn("[OAuth] iFlow: no access_token found in auth result, skipping API Key fetch");
-                            }
-                            else {
-                                // 调用getUserInfo获取API Key
-                                const userInfo = await fetchIFlowUserInfo(accessToken);
-                                console.log(`[OAuth] iFlow: successfully fetched API Key for ${userInfo.email}`);
-                                // 合并OAuth token和API Key数据
-                                const mergedToken = mergeIFlowTokenData(authed, userInfo);
-                                // 重新保存包含API Key的完整token数据
-                                await authCodeStrat.saveToken(mergedToken);
-                                console.log(`[OAuth] iFlow: API Key saved to token file`);
-                            }
-                        }
-                        catch (error) {
-                            console.error(`[OAuth] iFlow: failed to fetch API Key - ${error instanceof Error ? error.message : String(error)}`);
-                            // 不中断主流程，继续使用原始token
-                        }
-                    }
-                    return;
-                }
-                catch (e1) {
-                    console.warn(`[OAuth] auth_code flow failed: ${e1 instanceof Error ? e1.message : String(e1)}`);
-                    // 4.2 设备码后备（与老方式一致）
-                    try {
-                        const deviceStrat = createProviderOAuthStrategy(providerType, { ...overrides, flowType: OAuthFlowType.DEVICE_CODE }, tokenFilePath);
-                        const authed2 = await deviceStrat.authenticate({ openBrowser: true });
-                        if (typeof deviceStrat.saveToken === 'function' && authed2) {
-                            await deviceStrat.saveToken(authed2);
-                            console.log(`[OAuth] Token acquired (device_code) and saved: ${tokenFilePath}`);
-                        }
-                        lastRunAt.set(k, Date.now());
-                        // iFlow专用：获取API Key并更新token文件
-                        if (providerType === "iflow") {
-                            try {
-                                console.log("[OAuth] iFlow detected, fetching API Key via getUserInfo...");
-                                // 从认证结果中获取access_token
-                                const accessToken = authed2.access_token || authed2.AccessToken;
-                                if (!accessToken) {
-                                    console.warn("[OAuth] iFlow: no access_token found in auth result, skipping API Key fetch");
-                                }
-                                else {
-                                    // 调用getUserInfo获取API Key
-                                    const userInfo = await fetchIFlowUserInfo(accessToken);
-                                    console.log(`[OAuth] iFlow: successfully fetched API Key for ${userInfo.email}`);
-                                    // 合并OAuth token和API Key数据
-                                    const mergedToken = mergeIFlowTokenData(authed2, userInfo);
-                                    // 重新保存包含API Key的完整token数据
-                                    await deviceStrat.saveToken(mergedToken);
-                                    console.log(`[OAuth] iFlow: API Key saved to token file`);
-                                }
-                            }
-                            catch (error) {
-                                console.error(`[OAuth] iFlow: failed to fetch API Key - ${error instanceof Error ? error.message : String(error)}`);
-                                // 不中断主流程，继续使用原始token
-                            }
-                        }
-                        return;
-                    }
-                    catch (e2) {
-                        const msg = e2 instanceof Error ? e2.message : String(e2 || '');
-                        console.error(`[OAuth] device_code fallback failed: ${msg}`);
-                        throw e2;
-                    }
-                }
-            }
-            else {
-                try {
-                    const authed = await strat.authenticate({ openBrowser });
-                    if (typeof strat.saveToken === 'function' && authed) {
-                        await strat.saveToken(authed);
-                        console.log(`[OAuth] Token acquired and saved: ${tokenFilePath}`);
-                        // iFlow专用：获取API Key并更新token文件
-                        if (providerType === "iflow") {
-                            try {
-                                console.log("[OAuth] iFlow detected, fetching API Key via getUserInfo...");
-                                // 从认证结果中获取access_token
-                                const accessToken = authed.access_token || authed.AccessToken;
-                                if (!accessToken) {
-                                    console.warn("[OAuth] iFlow: no access_token found in auth result, skipping API Key fetch");
-                                }
-                                else {
-                                    // 调用getUserInfo获取API Key
-                                    const userInfo = await fetchIFlowUserInfo(accessToken);
-                                    console.log(`[OAuth] iFlow: successfully fetched API Key for ${userInfo.email}`);
-                                    // 合并OAuth token和API Key数据
-                                    const mergedToken = mergeIFlowTokenData(authed, userInfo);
-                                    // 重新保存包含API Key的完整token数据
-                                    await strat.saveToken(mergedToken);
-                                    console.log(`[OAuth] iFlow: API Key saved to token file`);
-                                }
-                            }
-                            catch (error) {
-                                console.error(`[OAuth] iFlow: failed to fetch API Key - ${error instanceof Error ? error.message : String(error)}`);
-                                // 不中断主流程，继续使用原始token
-                            }
-                        }
-                    }
-                    lastRunAt.set(k, Date.now());
-                }
-                catch (e) {
-                    const msg = e instanceof Error ? e.message : String(e || '');
-                    console.error(`[OAuth] interactive flow failed: ${msg}`);
-                    throw e;
-                }
-            }
-        }
-        catch (err) {
-            // 避免二次无条件触发授权：直接上抛，让调用方决定
-            throw err;
-        }
-    })();
-    inFlight.set(k, p);
-    try {
-        await p;
-    }
-    finally {
-        inFlight.delete(k);
-    }
-}
-export async function handleUpstreamInvalidOAuthToken(providerType, auth, upstreamError) {
-    try {
-        const msg = upstreamError instanceof Error ? upstreamError.message : String(upstreamError || '');
-        // quick heuristics for token invalid
-        const looksInvalid = /401|403|invalid[_-]?token|expired|40308/i.test(msg);
-        if (!looksInvalid)
-            return false;
-        await ensureValidOAuthToken(providerType, auth, { forceReacquireIfRefreshFails: true });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-// 读取 ~/.routecodex/auth/iflow-oauth.log 的最后一条记录，提取 decoded 字段中的 client_id:client_secret
-async function inferIflowClientCredsFromLog() {
-    try {
-        const home = process.env.HOME || '';
-        const file = path.join(home, '.routecodex', 'auth', 'iflow-oauth.log');
-        const txt = await fs.readFile(file, 'utf-8').catch(() => '');
-        if (!txt)
-            return null;
-        // 取最后一个非空行
-        const lines = txt.split(/\r?\n/).filter(l => l.trim().length > 0);
-        if (lines.length === 0)
-            return null;
-        // 从末尾向前找包含 decoded 的 JSON 行
-        for (let i = lines.length - 1; i >= 0; i--) {
-            const line = lines[i];
-            try {
-                const obj = JSON.parse(line);
-                const decoded = String(obj.decoded || '');
-                if (decoded.includes(':')) {
-                    const idx = decoded.indexOf(':');
-                    const id = decoded.slice(0, idx).trim();
-                    const secret = decoded.slice(idx + 1).trim();
-                    if (id && secret) {
-                        return { clientId: id, clientSecret: secret };
-                    }
-                }
-            }
-            catch { /* skip parse errors */ }
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
-//# sourceMappingURL=oauth-lifecycle.js.map

package/dist/modules/pipeline/modules/provider/v2/auth/oauth-lifecycle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"oauth-lifecycle.js","sourceRoot":"","sources":["../../../../../../../src/modules/pipeline/modules/provider/v2/auth/oauth-lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/modules/pipeline/modules/provider/v2/auth/qwen-userinfo-helper.d.ts

@@ -1,35 +0,0 @@
-/**
- * Qwen UserInfo 获取API Key的辅助函数
- * 对齐CLIProxyAPI的实现，为Qwen OAuth流程添加API Key获取功能
- */
-export interface QwenUserInfo {
-    apiKey?: string;
-    email?: string;
-    phone?: string;
-    name?: string;
-}
-export interface QwenTokenData {
-    access_token: string;
-    refresh_token?: string;
-    token_type: string;
-    expires_in?: number;
-    scope?: string;
-    expires_at?: number;
-    expired?: string;
-    api_key?: string;
-    email?: string;
-    type?: string;
-}
-/**
- * 使用access_token调用Qwen的userInfo接口获取API Key
- * 等价于CLIProxyAPI的FetchUserInfo
- */
-export declare function fetchQwenUserInfo(accessToken: string): Promise<QwenUserInfo>;
-/**
- * 将OAuth token与用户信息合并，创建完整的Qwen token数据
- */
-export declare function mergeQwenTokenData(oauthToken: Record<string, any>, userInfo: QwenUserInfo): QwenTokenData;
-/**
- * 检查Qwen token是否包含API Key
- */
-export declare function hasQwenApiKey(token: Record<string, any>): boolean;

package/dist/modules/pipeline/modules/provider/v2/auth/qwen-userinfo-helper.js

@@ -1,86 +0,0 @@
-/**
- * Qwen UserInfo 获取API Key的辅助函数
- * 对齐CLIProxyAPI的实现，为Qwen OAuth流程添加API Key获取功能
- */
-/**
- * 使用access_token调用Qwen的userInfo接口获取API Key
- * 等价于CLIProxyAPI的FetchUserInfo
- */
-export async function fetchQwenUserInfo(accessToken) {
-    if (!accessToken?.trim()) {
-        throw new Error('fetchQwenUserInfo: access token is empty');
-    }
-    const endpoint = `https://portal.qwen.ai/api/v1/user/info?access_token=${encodeURIComponent(accessToken)}`;
-    try {
-        const response = await fetch(endpoint, {
-            method: 'GET',
-            headers: {
-                'Accept': 'application/json',
-                'User-Agent': 'google-api-nodejs-client/9.15.1',
-                'X-Goog-Api-Client': 'gl-node/22.17.0',
-                'Client-Metadata': 'ideType=IDE_UNSPECIFIED,platform=PLATFORM_UNSPECIFIED,pluginType=GEMINI'
-            }
-        });
-        if (!response.ok) {
-            const text = await response.text().catch(() => 'unknown error');
-            throw new Error(`fetchQwenUserInfo: HTTP ${response.status} ${response.statusText} - ${text}`);
-        }
-        const result = await response.json();
-        // 解析响应格式，处理不同的可能格式
-        if (!result) {
-            throw new Error(`fetchQwenUserInfo: empty response`);
-        }
-        // Qwen的userInfo接口可能返回不同格式
-        let data = result;
-        if (result.data) {
-            data = result.data;
-        }
-        if (result.user) {
-            data = result.user;
-        }
-        const apiKey = String(data.apiKey || data.api_key || '').trim();
-        const email = String(data.email || data.mail || '').trim();
-        const phone = String(data.phone || data.mobile || '').trim();
-        const name = String(data.name || data.displayName || '').trim();
-        // Qwen可能不返回API Key，这种情况下我们仍然接受用户信息
-        return {
-            apiKey: apiKey || undefined,
-            email: email || undefined,
-            phone: phone || undefined,
-            name: name || undefined
-        };
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw error;
-        }
-        throw new Error(`fetchQwenUserInfo: request failed - ${String(error)}`);
-    }
-}
-/**
- * 将OAuth token与用户信息合并，创建完整的Qwen token数据
- */
-export function mergeQwenTokenData(oauthToken, userInfo) {
-    return {
-        ...oauthToken,
-        api_key: userInfo.apiKey,
-        email: userInfo.email,
-        type: 'qwen',
-        // 确保基本字段存在
-        access_token: oauthToken.access_token || '',
-        token_type: oauthToken.token_type || 'bearer',
-        refresh_token: oauthToken.refresh_token,
-        expires_in: oauthToken.expires_in,
-        scope: oauthToken.scope,
-        expires_at: oauthToken.expires_at,
-        expired: oauthToken.expired
-    };
-}
-/**
- * 检查Qwen token是否包含API Key
- */
-export function hasQwenApiKey(token) {
-    const apiKey = token.api_key || token.apiKey || '';
-    return typeof apiKey === 'string' && apiKey.trim().length > 0;
-}
-//# sourceMappingURL=qwen-userinfo-helper.js.map

package/dist/modules/pipeline/modules/provider/v2/auth/qwen-userinfo-helper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"qwen-userinfo-helper.js","sourceRoot":"","sources":["../../../../../../../src/modules/pipeline/modules/provider/v2/auth/qwen-userinfo-helper.ts"],"names":[],"mappings":"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"}

package/dist/modules/pipeline/modules/provider/v2/auth/tokenfile-auth.d.ts

@@ -1,33 +0,0 @@
-/**
- * TokenFile Authentication - reuse tokens produced by external login tools (e.g., CLIProxyAPI)
- *
- * For providers that don't expose public client credentials, we can piggyback on an
- * external login tool that stores OAuth tokens locally. This auth provider reads
- * the token JSON and injects `Authorization: Bearer <access_token>`.
- *
- * 更新：支持iFlow的API Key模式 - 优先使用api_key字段，回退到access_token
- */
-import type { IAuthProvider, AuthStatus } from './auth-interface.js';
-import type { OAuthAuth } from '../api/provider-config.js';
-export declare class TokenFileAuthProvider implements IAuthProvider {
-    readonly type: "oauth";
-    private config;
-    private status;
-    private isInitialized;
-    private token;
-    constructor(config: OAuthAuth);
-    initialize(): Promise<void>;
-    buildHeaders(): Record<string, string>;
-    validateCredentials(): Promise<boolean>;
-    cleanup(): Promise<void>;
-    getStatus(): AuthStatus;
-    private resolveTokenFile;
-    private expandHome;
-    private readJson;
-    private hasAccessToken;
-    private hasApiKey;
-    private extractAccessToken;
-    private extractApiKey;
-    private extractExpiresAt;
-    private updateStatus;
-}