Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
fix: improve the dedicated Windows YouTube browser login flow
wulien-centere6b4da8e8544
diff --git a/apps/daemon/src/api/routes.platform-connections.ts b/apps/daemon/src/api/routes.platform-connections.tsindex 8421bd69..0268ec4f 100644--- a/apps/daemon/src/api/routes.platform-connections.ts+++ b/apps/daemon/src/api/routes.platform-connections.ts@@ -15,6 +15,7 @@ export async function registerPlatformConnectionRoutes(server: FastifyInstance,}return youtube.connect(profileId as string | undefined);});+ server.post('/platform-connections/youtube/complete-login', () => youtube.completeLogin());server.post('/platform-connections/youtube/cancel', () => youtube.cancel());server.delete('/platform-connections/youtube', () => youtube.disconnect());server.post<{ Body: { cookies?: unknown } }>('/platform-connections/youtube/import', async (request, reply) => {diff --git a/apps/daemon/src/platform-connections/browser-close.ts b/apps/daemon/src/platform-connections/browser-close.tsnew file mode 100644index 00000000..bcca6eb1--- /dev/null+++ b/apps/daemon/src/platform-connections/browser-close.ts@@ -0,0 +1,122 @@+import { join } from 'node:path';+import { spawnCreatorProcess } from '../creator/process-tree.js';++export class BrowserCloseError extends Error {+ constructor(browser: 'chrome' | 'edge') {+ const name = browser === 'chrome' ? 'Chrome' : 'Edge';+ super(`无法读取 ${name} 登录窗口。请关闭刚才打开的 YouTube 登录窗口后重新连接;其他浏览器窗口可以保持打开。`);+ }+}++// 只发送正常关闭请求;浏览器有未保存内容或后台进程时交由用户处理。+export function windowsBrowserCloseScript(browser: 'chrome' | 'edge', targetPids: readonly number[]): string {+ if (targetPids.some(pid => !Number.isSafeInteger(pid) || pid <= 0)) throw new Error('Invalid process ID');+ const processName = browser === 'chrome' ? 'chrome' : 'msedge';+ return `+$ErrorActionPreference = 'Stop'+Add-Type -TypeDefinition @'+using System;+using System.Runtime.InteropServices;+public static class OpenCreatorBrowserClose {+ private delegate bool EnumWindow(IntPtr window, IntPtr parameter);+ [DllImport("user32.dll")] private static extern bool EnumWindows(EnumWindow callback, IntPtr parameter);+ [DllImport("user32.dll")] private static extern uint GetWindowThreadProcessId(IntPtr window, out uint processId);+ [DllImport("user32.dll")] private static extern bool IsWindowVisible(IntPtr window);+ [DllImport("user32.dll")] private static extern bool PostMessage(IntPtr window, uint message, IntPtr wParam, IntPtr lParam);+ public static void RequestClose(int[] processIds) {+ EnumWindows((window, parameter) => {+ uint processId;+ GetWindowThreadProcessId(window, out processId);+ if (Array.IndexOf(processIds, (int)processId) >= 0 && IsWindowVisible(window)) {+ PostMessage(window, 0x0010, IntPtr.Zero, IntPtr.Zero);+ }+ return true;+ }, IntPtr.Zero);+ }+}+'@+$sessionId = (Get-Process -Id $PID).SessionId+$targetPids = @(${targetPids.join(',')})+function Read-BrowserProcesses {+ @(Get-Process -Name '${processName}' -ErrorAction SilentlyContinue | Where-Object {+ $_.SessionId -eq $sessionId -and $targetPids -contains $_.Id+ })+}+$initial = @(Read-BrowserProcesses)+if ($initial.Count -gt 0) { [OpenCreatorBrowserClose]::RequestClose([int[]]@($initial | ForEach-Object { $_.Id })) }+$deadline = [DateTime]::UtcNow.AddSeconds(5)+do {+ $remaining = @(Read-BrowserProcesses)+ if ($remaining.Count -eq 0) { break }+ Start-Sleep -Milliseconds 200+} while ([DateTime]::UtcNow -lt $deadline)+@{ closed = ($remaining.Count -eq 0) } | ConvertTo-Json -Compress+`;+}++export async function runWindowsBrowserClose(script: string, signal: AbortSignal): Promise<boolean> {+ return (await runWindowsBrowserCommand(script, signal))?.closed === true;+}++export async function runWindowsBrowserCommand(script: string, signal: AbortSignal): Promise<Record<string, unknown> | undefined> {+ signal.throwIfAborted();+ const executable = join(process.env.SystemRoot ?? 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe');+ return new Promise((resolve, reject) => {+ const child = spawnCreatorProcess(executable, ['-NoProfile', '-NonInteractive', '-Command', script],+ { stdio: ['ignore', 'pipe', 'ignore'] }, signal);+ let output = '';+ const timeout = setTimeout(() => { child.kill(); resolve(undefined); }, 12_000);+ child.stdout?.setEncoding('utf8');+ child.stdout?.on('data', chunk => {+ output += chunk;+ if (output.length > 4096) { clearTimeout(timeout); child.kill(); resolve(undefined); }+ });+ child.once('error', () => { clearTimeout(timeout); resolve(undefined); });+ child.once('close', code => {+ clearTimeout(timeout);+ if (signal.aborted) { reject(signal.reason); return; }+ try { resolve(code === 0 ? JSON.parse(output) : undefined); }+ catch { resolve(undefined); }+ });+ });+}++export async function windowsProfileBrowserPids(browser: 'chrome' | 'edge', directory: string, signal: AbortSignal): Promise<number[]> {+ const processName = browser === 'chrome' ? 'chrome.exe' : 'msedge.exe';+ const encodedDirectory = Buffer.from(directory, 'utf8').toString('base64');+ const result = await runWindowsBrowserCommand(`+$ErrorActionPreference = 'Stop'+Add-Type -TypeDefinition @'+using System;+using System.Runtime.InteropServices;+public static class OpenCreatorBrowserArguments {+ [DllImport("shell32.dll", SetLastError = true)] private static extern IntPtr CommandLineToArgvW([MarshalAs(UnmanagedType.LPWStr)] string commandLine, out int count);+ [DllImport("kernel32.dll")] private static extern IntPtr LocalFree(IntPtr memory);+ public static bool HasProfile(string commandLine, string directory) {+ int count;+ IntPtr arguments = CommandLineToArgvW(commandLine, out count);+ if (arguments == IntPtr.Zero) return false;+ try {+ for (int i = 0; i < count; i++) {+ string argument = Marshal.PtrToStringUni(Marshal.ReadIntPtr(arguments, i * IntPtr.Size));+ if (String.Equals(argument, "--user-data-dir=" + directory, StringComparison.OrdinalIgnoreCase)) return true;+ if (argument == "--user-data-dir" && i + 1 < count && String.Equals(Marshal.PtrToStringUni(Marshal.ReadIntPtr(arguments, (i + 1) * IntPtr.Size)), directory, StringComparison.OrdinalIgnoreCase)) return true;+ }+ return false;+ } finally { LocalFree(arguments); }+ }+}+'@+$directory = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${encodedDirectory}'))+$sessionId = (Get-Process -Id $PID).SessionId+$pids = @(Get-CimInstance Win32_Process -Filter "Name = '${processName}'" | Where-Object {+ $_.SessionId -eq $sessionId -and $_.CommandLine -and [OpenCreatorBrowserArguments]::HasProfile($_.CommandLine, $directory)+} | ForEach-Object { [int]$_.ProcessId })+@{ pids = $pids } | ConvertTo-Json -Compress+`, signal);+ if (!Array.isArray(result?.pids) || result.pids.some(pid => !Number.isSafeInteger(pid) || pid <= 0)) {+ signal.throwIfAborted();+ throw new Error('无法确认 YouTube 登录窗口,请重试连接。');+ }+ return result.pids as number[];+}diff --git a/apps/daemon/src/platform-connections/browser-login.ts b/apps/daemon/src/platform-connections/browser-login.tsnew file mode 100644index 00000000..217f1b10--- /dev/null+++ b/apps/daemon/src/platform-connections/browser-login.ts@@ -0,0 +1,68 @@+import { spawn } from 'node:child_process';+import { createHash } from 'node:crypto';+import { mkdir, stat } from 'node:fs/promises';+import { join, resolve } from 'node:path';+import { spawnCreatorProcess, terminateProcessTree } from '../creator/process-tree.js';+import { runWindowsBrowserClose, windowsBrowserCloseScript, windowsProfileBrowserPids } from './browser-close.js';+import type { BrowserProfile } from './browser.js';++export type BrowserLoginSession = {+ profile: BrowserProfile;+ exited: Promise<void>;+ close(signal: AbortSignal): Promise<void>;+ dispose(): Promise<void>;+};++export class LoginBrowserCloseError extends Error {+ constructor() { super('请关闭刚才打开的 YouTube 登录窗口,再点击“完成登录”。其他 Chrome 窗口可以保持打开。'); }+}++export function windowsYouTubeBrowserArgs(directory: string, url = 'https://accounts.google.com/ServiceLogin?service=youtube&continue=https%3A%2F%2Fwww.youtube.com%2F'): string[] {+ return [`--user-data-dir=${directory}`, '--no-first-run', '--no-default-browser-check', '--disable-background-mode',+ '--new-window', url];+}++export async function openWindowsYouTubeLogin(input: { root: string; signal: AbortSignal; url?: string }): Promise<BrowserLoginSession> {+ input.signal.throwIfAborted();+ const executable = await findChrome();+ const directory = resolve(input.root, 'browser-chrome');+ await mkdir(directory, { recursive: true });+ const existing = await windowsProfileBrowserPids('chrome', directory, input.signal);+ input.signal.throwIfAborted();+ // 普通 Chrome 会话:不启用调试或自动化,使用独立用户目录保存登录。+ const browser = spawn(executable, windowsYouTubeBrowserArgs(directory, input.url), { stdio: 'ignore', windowsHide: true });+ await new Promise<void>((resolve, reject) => {+ browser.once('spawn', resolve);+ browser.once('error', () => reject(new Error('无法打开 Chrome 登录窗口,请重试连接。')));+ });+ const pids = existing.length ? existing : [browser.pid!];+ const powershell = join(process.env.SystemRoot ?? 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe');+ const watcher = spawnCreatorProcess(powershell, ['-NoProfile', '-NonInteractive', '-Command',+ `Wait-Process -Id @(${pids.join(',')}) -ErrorAction SilentlyContinue`], { stdio: 'ignore' }, input.signal);+ const exited = new Promise<void>(resolve => {+ watcher.once('close', code => { if (code === 0 && !input.signal.aborted) resolve(); });+ watcher.once('error', () => { /* 监测不可用时仍可通过“完成登录”保存。 */ });+ });+ return {+ profile: { id: createHash('sha256').update(directory).digest('hex').slice(0, 24), browser: 'chrome',+ label: 'Chrome · OpenCreator', directory: join(directory, 'Default'), preferred: true },+ exited,+ async close(signal) {+ // 每次关闭前按完整用户目录重新确认归属,绝不请求关闭用户的普通 Chrome。+ const current = await windowsProfileBrowserPids('chrome', directory, signal);+ const closed = await runWindowsBrowserClose(windowsBrowserCloseScript('chrome', current), signal);+ signal.throwIfAborted();+ if (!closed) throw new LoginBrowserCloseError();+ },+ async dispose() { if (watcher.exitCode === null) await terminateProcessTree(watcher.pid); }+ };+}++async function findChrome(): Promise<string> {+ for (const root of [process.env.PROGRAMFILES, process.env['PROGRAMFILES(X86)'], process.env.LOCALAPPDATA]) {+ if (!root) continue;+ const executable = join(root, 'Google/Chrome/Application/chrome.exe');+ if ((await stat(executable).catch(() => undefined))?.isFile()) return executable;+ }+ throw new Error('未找到 Chrome,请安装 Chrome 后重新连接 YouTube。');+}diff --git a/apps/daemon/src/platform-connections/browser.ts b/apps/daemon/src/platform-connections/browser.tsindex ccc1afe9..9f251350 100644--- a/apps/daemon/src/platform-connections/browser.ts+++ b/apps/daemon/src/platform-connections/browser.ts@@ -4,7 +4,8 @@ import { homedir } from 'node:os';import { join } from 'node:path';import { spawnCreatorProcess } from '../creator/process-tree.js';import type { YtDlpRuntime } from '../creator/yt-dlp/runtime.js';-import { filterYouTubeCookies, type YouTubeCookie } from './cookies.js';+import { filterYouTubeCookies, hasYouTubeAuthentication, type YouTubeCookie } from './cookies.js';+import { BrowserCloseError } from './browser-close.js';export type BrowserProfile = { id: string; browser: 'chrome' | 'edge'; label: string; directory: string; preferred: boolean };@@ -47,14 +48,20 @@ from yt_dlp.cookies import extract_cookies_from_browser, YDLLoggerfrom yt_dlp.utils import DownloadErrorclass QuietLogger(YDLLogger):decryption_failed = False+ failure = 'read-failed'def debug(self, *args, **kwargs): passdef info(self, *args, **kwargs): passdef warning(self, message, *args, **kwargs):- if 'decrypt' in str(message) or 'key found' in str(message) or 'find-generic-password failed' in str(message):+ if 'decrypt' in str(message) or 'key found' in str(message) or 'find-generic-password failed' in str(message) or (sys.platform == 'win32' and 'unknown cookie version' in str(message).lower()):self.decryption_failed = True- def error(self, *args, **kwargs): raise DownloadError('Browser cookie extraction failed')+ def error(self, message, *args, **kwargs):+ if 'could not copy' in str(message).lower() and 'cookie' in str(message).lower():+ self.failure = 'browser-locked'+ elif 'decrypt' in str(message).lower() or 'encrypted key' in str(message).lower() or 'invalid key' in str(message).lower():+ self.failure = 'decryption-failed'+ raise DownloadError('Browser cookie extraction failed')+logger = QuietLogger()try:- logger = QuietLogger()jar = extract_cookies_from_browser(sys.argv[2], profile=sys.argv[3], logger=logger)cookies = []for c in jar:@@ -67,6 +74,8 @@ try:secure=bool(c.secure), httpOnly=c.has_nonstandard_attr('HttpOnly'), expires=expires))sys.stdout.write(json.dumps(dict(cookies=cookies, decryptionFailed=logger.decryption_failed)))except Exception:+ if sys.platform == 'win32':+ sys.stdout.write(json.dumps(dict(failure=logger.failure)))sys.exit(1)`;@@ -94,14 +103,29 @@ export async function readBrowserYouTubeCookies(input: {child.once('error', () => reject(new Error('无法读取浏览器 Cookie,请检查本地组件。')));child.once('close', code => {if (signal.aborted) reject(new Error('连接已取消。'));- else if (code !== 0) reject(new Error('无法读取 Chrome / Edge 的 Cookie。请允许钥匙串访问;若浏览器加密或文件锁阻止读取,可导入 Cookie 文件。'));+ else if (code !== 0) {+ if (process.platform === 'win32') {+ let failure: string | undefined;+ try { failure = JSON.parse(Buffer.concat(chunks).toString('utf8')).failure; } catch { /* 输出不完整时使用通用错误。 */ }+ reject(failure === 'browser-locked' ? new BrowserCloseError(profile.browser)+ : failure === 'decryption-failed' ? windowsDecryptionError()+ : new Error('无法读取 YouTube 登录态,请重新连接并完成登录。'));+ } else reject(new Error('无法读取 Chrome / Edge 的 Cookie。请允许钥匙串访问;若浏览器加密或文件锁阻止读取,可导入 Cookie 文件。'));+ }else resolve(Buffer.concat(chunks).toString('utf8'));});});const result = JSON.parse(output) as { cookies?: unknown; decryptionFailed?: boolean };const cookies = filterYouTubeCookies(result.cookies);+ if (process.platform === 'win32' && result.decryptionFailed && !hasYouTubeAuthentication(cookies)) {+ throw windowsDecryptionError();+ }if (result.decryptionFailed && cookies.length === 0) {throw new Error('浏览器 Cookie 解密失败,请允许 macOS 钥匙串访问后重新连接;当前浏览器的加密方式也可能不受 yt-dlp 支持。');}return cookies;}++function windowsDecryptionError(): Error {+ return new Error('无法解密 YouTube 登录态,请断开后重新连接并登录。');+}diff --git a/apps/daemon/src/platform-connections/youtube.ts b/apps/daemon/src/platform-connections/youtube.tsindex a492d195..6b409dd2 100644--- a/apps/daemon/src/platform-connections/youtube.ts+++ b/apps/daemon/src/platform-connections/youtube.ts@@ -5,12 +5,13 @@ import type { YouTubeConnectionState } from '@opencreator/protocol';import { readPrivateJsonFile, writePrivateJsonFile } from '../config/private-json-file.js';import type { YtDlpRuntime } from '../creator/yt-dlp/runtime.js';import { listBrowserProfiles, readBrowserYouTubeCookies, type BrowserProfile } from './browser.js';+import { LoginBrowserCloseError, openWindowsYouTubeLogin, type BrowserLoginSession } from './browser-login.js';import { filterYouTubeCookies, hasYouTubeAuthentication, parseYouTubeCookies,serializeYouTubeCookies, type YouTubeCookie } from './cookies.js';type Credential = { version: 1; cookies: YouTubeCookie[]; connectedAt: string;browser?: 'chrome' | 'edge'; profileId?: string; invalidated?: boolean };-type ConnectionAttempt = { controller: AbortController; work: Promise<void> };+type ConnectionAttempt = { controller: AbortController; work: Promise<void>; completeLogin?: () => void };export class YouTubeConnectionService {private state: YouTubeConnectionState = { platform: 'youtube', status: 'disconnected' };@@ -23,7 +24,9 @@ export class YouTubeConnectionService {getRuntime(): YtDlpRuntime | undefined;listProfiles?: typeof listBrowserProfiles;readBrowserCookies?: typeof readBrowserYouTubeCookies;+ openLoginBrowser?: typeof openWindowsYouTubeLogin;connectionTimeoutMs?: number;+ platform?: NodeJS.Platform;}) { this.credentialFile = join(input.root, 'credentials.json'); }async initialize(): Promise<void> {@@ -45,6 +48,14 @@ export class YouTubeConnectionService {connect(profileId?: string): Promise<YouTubeConnectionState> {return this.serialize(async () => {if (this.attempt) return this.publicState();+ if ((this.input.platform ?? process.platform) === 'win32') {+ if (await this.hasAuthentication()) { await this.refreshState(); return this.publicState(); }+ const attempt: ConnectionAttempt = { controller: new AbortController(), work: Promise.resolve() };+ this.attempt = attempt;+ this.state = { platform: 'youtube', status: 'connecting', message: '正在打开 YouTube 登录窗口' };+ attempt.work = this.finishConnection(attempt);+ return this.publicState();+ }const profiles = await (this.input.listProfiles ?? listBrowserProfiles)();const profile = profileId ? profiles.find(p => p.id === profileId) : profiles[0];if (!profile) {@@ -58,6 +69,15 @@ export class YouTubeConnectionService {return this.publicState();});}+ completeLogin(): Promise<YouTubeConnectionState> {+ return this.serialize(async () => {+ if (this.attempt?.completeLogin) {+ this.attempt.completeLogin();+ this.state = { platform: 'youtube', status: 'connecting', browser: 'chrome', message: '正在保存 YouTube 登录态' };+ }+ return this.publicState();+ });+ }cancel(): Promise<YouTubeConnectionState> {return this.serialize(async () => { await this.stopConnection(); await this.refreshState(); return this.publicState(); });}@@ -65,6 +85,11 @@ export class YouTubeConnectionService {return this.serialize(async () => {await this.stopConnection();await rm(this.credentialFile, { force: true });+ if ((this.input.platform ?? process.platform) === 'win32') {+ for (const browser of ['chrome', 'edge']) {+ await rm(join(this.input.root, `browser-${browser}`), { recursive: true, force: true, maxRetries: 3, retryDelay: 200 });+ }+ }this.state = { platform: 'youtube', status: 'disconnected' };return this.publicState();});@@ -111,31 +136,77 @@ export class YouTubeConnectionService {} finally { await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 200 }); }}async close(): Promise<void> { await this.serialize(() => this.stopConnection()); }- private async finishConnection(attempt: ConnectionAttempt, profile: BrowserProfile): Promise<void> {- const timeout = setTimeout(() => attempt.controller.abort(), this.input.connectionTimeoutMs ?? 120_000);+ private async finishConnection(attempt: ConnectionAttempt, profile?: BrowserProfile): Promise<void> {+ const managed = (this.input.platform ?? process.platform) === 'win32';+ const timeout = setTimeout(() => attempt.controller.abort(), this.input.connectionTimeoutMs ?? (managed ? 600_000 : 120_000));+ let login: BrowserLoginSession | undefined;+ let browserClosed = false;try {+ if (managed) {+ login = await (this.input.openLoginBrowser ?? openWindowsYouTubeLogin)({ root: this.input.root, signal: attempt.controller.signal });+ profile = login.profile;+ let message = '请在打开的 Chrome 窗口中登录 YouTube';+ let actionRequired: 'complete-login' | 'close-login-browser' = 'complete-login';+ let watchExit = true;+ while (!browserClosed) {+ this.state = { platform: 'youtube', status: 'connecting', browser: 'chrome', profileId: profile.id, message, actionRequired };+ await this.waitForLoginCompletion(attempt, login, watchExit);+ watchExit = false;+ attempt.controller.signal.throwIfAborted();+ this.state = { platform: 'youtube', status: 'connecting', browser: 'chrome', profileId: profile.id, message: '正在保存 YouTube 登录态' };+ try { await login.close(attempt.controller.signal); browserClosed = true; }+ catch (error) {+ if (!(error instanceof LoginBrowserCloseError)) throw error;+ message = error.message; actionRequired = 'close-login-browser';+ }+ }+ }+ attempt.controller.signal.throwIfAborted();+ if (!profile) throw new Error('未找到可用的浏览器账号,请重新连接。');const cookies = await (this.input.readBrowserCookies ?? readBrowserYouTubeCookies)({profile, runtime: this.input.getRuntime(), signal: attempt.controller.signal });attempt.controller.signal.throwIfAborted();- if (!hasYouTubeAuthentication(cookies)) throw new Error('此浏览器账号尚未登录 YouTube,或登录已过期。请在该账号中登录后重新连接。');+ if (!hasYouTubeAuthentication(cookies)) throw new Error(managed+ ? '尚未完成 YouTube 登录,请重新连接并在登录窗口中完成登录。'+ : '此浏览器账号尚未登录 YouTube,或登录已过期。请在该账号中登录后重新连接。');const connectedAt = new Date().toISOString();await writePrivateJsonFile(this.credentialFile, {version: 1, cookies, connectedAt, browser: profile.browser, profileId: profile.id} satisfies Credential);this.state = { platform: 'youtube', status: 'connected', connectedAt, browser: profile.browser, profileId: profile.id };} catch (error) {- this.state = { platform: 'youtube', status: 'error', message: attempt.controller.signal.aborted- ? '连接已取消或超时,请重新连接。' : publicConnectionError(error) };+ this.state = { platform: 'youtube', status: 'error', browser: profile?.browser, profileId: profile?.id,+ message: attempt.controller.signal.aborted ? '连接已取消或超时,请重新连接。' : publicConnectionError(error) };} finally {clearTimeout(timeout);+ if (login) {+ if (!browserClosed) await login.close(AbortSignal.timeout(12_000)).catch(() => undefined);+ await login.dispose().catch(() => undefined);+ }if (this.attempt === attempt) this.attempt = undefined;}}+ private waitForLoginCompletion(attempt: ConnectionAttempt, login: BrowserLoginSession, watchExit: boolean): Promise<void> {+ const signal = attempt.controller.signal;+ signal.throwIfAborted();+ return new Promise((resolve, reject) => {+ const cleanup = () => {+ signal.removeEventListener('abort', abort);+ if (attempt.completeLogin === complete) attempt.completeLogin = undefined;+ };+ const complete = () => { cleanup(); resolve(); };+ const abort = () => { cleanup(); reject(signal.reason); };+ attempt.completeLogin = complete;+ signal.addEventListener('abort', abort, { once: true });+ if (watchExit) void login.exited.then(complete);+ });+ }private async stopConnection(): Promise<void> {const attempt = this.attempt;if (!attempt) return;attempt.controller.abort();await attempt.work;+ if (this.attempt === attempt) this.attempt = undefined;}private async readCredential(): Promise<Credential | undefined> {const raw = await readPrivateJsonFile(this.credentialFile);@@ -152,6 +223,7 @@ export class YouTubeConnectionService {} : { platform: 'youtube', status: 'disconnected' };}private async publicState(): Promise<YouTubeConnectionState> {+ if ((this.input.platform ?? process.platform) === 'win32') return { ...this.state, connectionMethod: 'browser-login' };const profiles = await (this.input.listProfiles ?? listBrowserProfiles)();return { ...this.state, profiles: profiles.map(({ id, browser, label }) => ({ id, browser, label })) };}diff --git a/apps/daemon/test/integration/youtube-browser-close.test.ts b/apps/daemon/test/integration/youtube-browser-close.test.tsnew file mode 100644index 00000000..f7fde6ce--- /dev/null+++ b/apps/daemon/test/integration/youtube-browser-close.test.ts@@ -0,0 +1,61 @@+import { spawn, execFileSync, type ChildProcess } from 'node:child_process';+import { existsSync } from 'node:fs';+import { mkdtemp, readFile, rm } from 'node:fs/promises';+import { tmpdir } from 'node:os';+import { join } from 'node:path';+import { expect, it, vi } from 'vitest';+import { runWindowsBrowserClose, windowsBrowserCloseScript } from '../../src/platform-connections/browser-close.js';+import { terminateProcessTree } from '../../src/creator/process-tree.js';++const chrome = [process.env.PROGRAMFILES, process.env['PROGRAMFILES(X86)'], process.env.LOCALAPPDATA]+ .filter((root): root is string => !!root).map(root => join(root, 'Google/Chrome/Application/chrome.exe')).find(existsSync);++it('拒绝非法 PID,防止关闭脚本注入', () => {+ for (const pid of [0, -1, NaN, 1.5]) expect(() => windowsBrowserCloseScript('chrome', [pid])).toThrow();+});++it.runIf(process.platform === 'win32')('没有目标进程时正常返回,取消会终止本任务的关闭脚本', async () => {+ expect(await runWindowsBrowserClose(windowsBrowserCloseScript('chrome', []), AbortSignal.timeout(15_000))).toBe(true);+ const controller = new AbortController();+ const work = runWindowsBrowserClose('Start-Sleep -Seconds 60', controller.signal);+ const rejected = expect(work).rejects.toThrow();+ controller.abort();+ await rejected;+}, 20_000);++it.runIf(process.platform === 'win32' && !!chrome)('发送正常关闭请求可关闭隔离 Chrome 的全部窗口,不触碰用户浏览器', async () => {+ const root = await mkdtemp(join(tmpdir(), 'youtube-browser-close-'));+ let child: ChildProcess | undefined;+ try {+ child = spawn(chrome!, [`--user-data-dir=${root}`, '--no-first-run', '--no-default-browser-check',+ '--disable-background-mode', '--disable-gpu', '--new-window', 'about:blank'], { stdio: 'ignore' });+ const pid = child.pid!;+ const powershell = join(process.env.SystemRoot!, 'System32/WindowsPowerShell/v1.0/powershell.exe');+ await vi.waitFor(() => {+ expect(child!.exitCode).toBeNull();+ const handle = execFileSync(powershell, ['-NoProfile', '-NonInteractive', '-Command',+ `(Get-Process -Id ${pid}).MainWindowHandle.ToInt64()`], { encoding: 'utf8', timeout: 5000, windowsHide: true });+ expect(Number(handle.trim())).not.toBe(0);+ }, { timeout: 15_000, interval: 300 });+ execFileSync(chrome!, [`--user-data-dir=${root}`, '--new-window', 'about:blank'], { timeout: 5000, stdio: 'ignore' });+ expect(await runWindowsBrowserClose(windowsBrowserCloseScript('chrome', [pid]), AbortSignal.timeout(15_000))).toBe(true);+ await vi.waitFor(() => expect(child!.exitCode).not.toBeNull());+ } finally {+ if (child?.exitCode === null) await terminateProcessTree(child.pid);+ await rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 });+ }+}, 35_000);++it.runIf(process.platform === 'win32' && !!chrome)('仅剩后台 Chrome 时无法正常关闭,返回失败供用户手动处理', async () => {+ const root = await mkdtemp(join(tmpdir(), 'youtube-browser-background-'));+ const child = spawn(chrome!, [`--user-data-dir=${root}`, '--headless', '--remote-debugging-port=0',+ '--no-first-run', '--no-default-browser-check', '--disable-gpu', 'about:blank'], { stdio: 'ignore' });+ try {+ await vi.waitFor(async () => expect(await readFile(join(root, 'DevToolsActivePort'), 'utf8')).toMatch(/^\d+/), { timeout: 10_000 });+ expect(await runWindowsBrowserClose(windowsBrowserCloseScript('chrome', [child.pid!]), AbortSignal.timeout(15_000))).toBe(false);+ expect(child.exitCode).toBeNull();+ } finally {+ await terminateProcessTree(child.pid);+ await rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 });+ }+}, 30_000);diff --git a/apps/daemon/test/integration/youtube-browser-import.test.ts b/apps/daemon/test/integration/youtube-browser-import.test.tsindex 72f35b89..dfe8ab92 100644--- a/apps/daemon/test/integration/youtube-browser-import.test.ts+++ b/apps/daemon/test/integration/youtube-browser-import.test.ts@@ -1,11 +1,22 @@import Database from 'better-sqlite3';-import { mkdir, mkdtemp, readFile, rm } from 'node:fs/promises';+import { execFileSync, spawn } from 'node:child_process';+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';import { tmpdir } from 'node:os';import { join } from 'node:path';import { expect, it } from 'vitest';import { readBrowserYouTubeCookies } from '../../src/platform-connections/browser.js';import { hasYouTubeAuthentication } from '../../src/platform-connections/cookies.js';import { resolveYtDlpRuntime } from '../../src/creator/yt-dlp/runtime.js';+import { BrowserCloseError } from '../../src/platform-connections/browser-close.js';+import { terminateProcessTree } from '../../src/creator/process-tree.js';++async function writeWindowsLocalState(root: string): Promise<void> {+ if (process.platform !== 'win32') return;+ const key = execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command',+ "Add-Type -AssemblyName System.Security; $key = [Security.Cryptography.ProtectedData]::Protect([byte[]](1..32), $null, [Security.Cryptography.DataProtectionScope]::CurrentUser); [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes('DPAPI') + $key)"],+ { encoding: 'utf8', windowsHide: true, timeout: 5000 }).trim();+ await writeFile(join(root, 'Local State'), JSON.stringify({ os_crypt: { encrypted_key: key } }));+}it.runIf(!!process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT)('uses the real portable Python and yt-dlp importer and normalizes Chromium cookie types and epoch', async () => {const resourceRoot = process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT!;@@ -15,6 +26,7 @@ it.runIf(!!process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT)('uses the real porconst directory = join(root, 'Default');try {await mkdir(directory);+ await writeWindowsLocalState(root);const db = new Database(join(directory, 'Cookies'));try {db.exec("CREATE TABLE meta (key TEXT, value TEXT); INSERT INTO meta VALUES ('version','24'); CREATE TABLE cookies (host_key TEXT, name TEXT, value TEXT, encrypted_value BLOB, path TEXT, expires_utc INTEGER, is_secure INTEGER)");@@ -32,3 +44,49 @@ it.runIf(!!process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT)('uses the real por} finally { db.close(); }} finally { await rm(root, { recursive: true, force: true }); }}, 20_000);++it.runIf(process.platform === 'win32' && !!process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT)('Windows 真实文件锁会提示手动关闭浏览器', async () => {+ const resourceRoot = process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT!;+ const manifest = JSON.parse(await readFile(join(resourceRoot, 'manifest.json'), 'utf8'));+ const runtime = resolveYtDlpRuntime({ resourceRoot, manifest });+ const root = await mkdtemp(join(tmpdir(), 'youtube-browser-locked-'));+ const directory = join(root, 'Default');+ await mkdir(directory);+ const file = join(directory, 'Cookies');+ const db = new Database(file); db.close();+ const script = `$stream = [IO.File]::Open('${file.replace(/'/g, "''")}', [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::None); Write-Output 'ready'; Start-Sleep -Seconds 30; $stream.Dispose()`;+ const child = spawn('powershell.exe', ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')],+ { stdio: ['ignore', 'pipe', 'ignore'], windowsHide: true });+ try {+ await new Promise<void>((resolve, reject) => {+ const timeout = setTimeout(() => reject(new Error('文件锁准备超时')), 5000);+ child.once('error', error => { clearTimeout(timeout); reject(error); });+ child.stdout!.once('data', () => { clearTimeout(timeout); resolve(); });+ });+ await expect(readBrowserYouTubeCookies({ profile: { id: 'fixture', browser: 'chrome', directory, label: 'Test', preferred: true },+ runtime, signal: AbortSignal.timeout(15_000) })).rejects.toBeInstanceOf(BrowserCloseError);+ } finally {+ await terminateProcessTree(child.pid);+ await rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 });+ }+}, 20_000);++it.runIf(process.platform === 'win32' && !!process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT)('新版 Chromium v20 加密失败时明确提示解密问题,不误报为未登录', async () => {+ const resourceRoot = process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT!;+ const manifest = JSON.parse(await readFile(join(resourceRoot, 'manifest.json'), 'utf8'));+ const runtime = resolveYtDlpRuntime({ resourceRoot, manifest });+ const root = await mkdtemp(join(tmpdir(), 'youtube-browser-v20-'));+ const directory = join(root, 'Default');+ try {+ await mkdir(directory);+ await writeWindowsLocalState(root);+ const db = new Database(join(directory, 'Cookies'));+ try {+ db.exec("CREATE TABLE meta (key TEXT, value TEXT); INSERT INTO meta VALUES ('version','24'); CREATE TABLE cookies (host_key TEXT, name TEXT, value TEXT, encrypted_value BLOB, path TEXT, expires_utc INTEGER, is_secure INTEGER)");+ const future = (Math.floor(Date.now() / 1000) + 3600 + 11644473600) * 1000000;+ db.prepare('INSERT INTO cookies VALUES (?, ?, ?, ?, ?, ?, ?)').run('.youtube.com', 'SID', '', Buffer.from('v20fixture-encrypted-cookie'), '/', future, 1);+ } finally { db.close(); }+ await expect(readBrowserYouTubeCookies({ profile: { id: 'fixture', browser: 'chrome', directory, label: 'Test', preferred: true },+ runtime, signal: AbortSignal.timeout(15_000) })).rejects.toThrow('无法解密');+ } finally { await rm(root, { recursive: true, force: true }); }+}, 20_000);diff --git a/apps/daemon/test/integration/youtube-browser-login.test.ts b/apps/daemon/test/integration/youtube-browser-login.test.tsnew file mode 100644index 00000000..91a91023--- /dev/null+++ b/apps/daemon/test/integration/youtube-browser-login.test.ts@@ -0,0 +1,80 @@+import { execFileSync } from 'node:child_process';+import { existsSync } from 'node:fs';+import { mkdtemp, readFile, rm } from 'node:fs/promises';+import { createServer } from 'node:http';+import { tmpdir } from 'node:os';+import { join } from 'node:path';+import Database from 'better-sqlite3';+import { expect, it } from 'vitest';+import { openWindowsYouTubeLogin, windowsYouTubeBrowserArgs, type BrowserLoginSession } from '../../src/platform-connections/browser-login.js';+import { windowsProfileBrowserPids } from '../../src/platform-connections/browser-close.js';+import { resolveYtDlpRuntime } from '../../src/creator/yt-dlp/runtime.js';+import { terminateProcessTree } from '../../src/creator/process-tree.js';++const chrome = [process.env.PROGRAMFILES, process.env['PROGRAMFILES(X86)'], process.env.LOCALAPPDATA]+ .some(root => root && existsSync(join(root, 'Google/Chrome/Application/chrome.exe')));++it('专用登录参数不启用浏览器调试、自动化或内嵌 Chromium', () => {+ const args = windowsYouTubeBrowserArgs('C:\\test profile');+ expect(args[0]).toBe('--user-data-dir=C:\\test profile');+ expect(args.at(-1)).toMatch(/^https:\/\/accounts.google.com\//);+ expect(args.join(' ')).not.toMatch(/remote-debugging|enable-automation|headless|disable-web-security/);+});++it.runIf(process.platform === 'win32' && chrome)('真实 Chrome 专用目录生成可解密 v10 Cookie,关闭时其他窗口仍在运行', async () => {+ const root = await mkdtemp(join(tmpdir(), 'youtube login with spaces '));+ const otherRoot = await mkdtemp(join(tmpdir(), 'youtube-other-window-'));+ const sessions: BrowserLoginSession[] = [];+ let loaded!: () => void;+ const visited = new Promise<void>(resolve => { loaded = resolve; });+ const server = createServer((_request, response) => {+ response.writeHead(200, { 'Content-Type': 'text/html', 'Set-Cookie': [+ 'SID=fixture-SID; Path=/; Max-Age=3600; HttpOnly', 'SAPISID=fixture-SAPISID; Path=/; Max-Age=3600; HttpOnly'+ ] });+ response.end('<!doctype html><title>OpenCreator login test</title>Local cookie test');+ loaded();+ });+ await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));+ try {+ const port = (server.address() as { port: number }).port;+ const signal = AbortSignal.timeout(40_000);+ const other = await openWindowsYouTubeLogin({ root: otherRoot, signal, url: 'about:blank' });+ sessions.push(other);+ const login = await openWindowsYouTubeLogin({ root, signal, url: `http://127.0.0.1:${port}` });+ sessions.push(login);+ await Promise.race([visited, new Promise((_, reject) => {+ signal.addEventListener('abort', () => reject(signal.reason), { once: true });+ })]);+ expect((await windowsProfileBrowserPids('chrome', join(root, 'browser-chrome'), signal)).length).toBeGreaterThan(0);+ await login.close(signal);+ await login.exited;+ expect((await windowsProfileBrowserPids('chrome', join(otherRoot, 'browser-chrome'), signal)).length).toBeGreaterThan(0);+ const db = new Database(join(login.profile.directory, 'Network/Cookies'), { readonly: true });+ try {+ const rows = db.prepare("SELECT encrypted_value FROM cookies WHERE host_key = '127.0.0.1' AND name IN ('SID','SAPISID')")+ .all() as Array<{ encrypted_value: Buffer }>;+ expect(rows).toHaveLength(2);+ expect(rows.map(row => row.encrypted_value.subarray(0, 3).toString())).toEqual(['v10', 'v10']);+ } finally { db.close(); }+ if (process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT) {+ const resourceRoot = process.env.OPENCREATOR_TEST_BROWSER_RUNTIME_ROOT;+ const manifest = JSON.parse(await readFile(join(resourceRoot, 'manifest.json'), 'utf8'));+ const runtime = resolveYtDlpRuntime({ resourceRoot, manifest })!;+ // 只验证 localhost 测试 Cookie 的解密,不接触真实账号,也不代表 Google 登录已验证。+ const script = "import sys,json; sys.path.insert(0,sys.argv[1]); from yt_dlp.cookies import extract_cookies_from_browser; jar=extract_cookies_from_browser('chrome',profile=sys.argv[2]); print(json.dumps(sorted(c.name for c in jar if c.domain=='127.0.0.1' and c.value=='fixture-'+c.name)))";+ const result = execFileSync(runtime.executable, ['-I', '-B', '-c', script, runtime.script!, login.profile.directory],+ { encoding: 'utf8', windowsHide: true, timeout: 15_000, env: { ...process.env, ...runtime.env }, stdio: ['ignore', 'pipe', 'ignore'] });+ expect(JSON.parse(result)).toEqual(['SAPISID', 'SID']);+ }+ await other.close(signal);+ } finally {+ for (const session of sessions) { await session.close(AbortSignal.timeout(12_000)).catch(() => undefined); await session.dispose(); }+ for (const directory of [root, otherRoot]) {+ for (const pid of await windowsProfileBrowserPids('chrome', join(directory, 'browser-chrome'), AbortSignal.timeout(15_000))) {+ await terminateProcessTree(pid);+ }+ await rm(directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 });+ }+ await new Promise<void>(resolve => server.close(() => resolve()));+ }+}, 60_000);diff --git a/apps/daemon/test/integration/youtube-connection.test.ts b/apps/daemon/test/integration/youtube-connection.test.tsindex 5c604a5d..ba7b9044 100644--- a/apps/daemon/test/integration/youtube-connection.test.ts+++ b/apps/daemon/test/integration/youtube-connection.test.ts@@ -9,6 +9,7 @@ import { registerPlatformConnectionRoutes } from '../../src/api/routes.platform-import { requireAuth } from '../../src/api/auth.js';import type { BrowserProfile, readBrowserYouTubeCookies } from '../../src/platform-connections/browser.js';import type { YtDlpRuntime } from '../../src/creator/yt-dlp/runtime.js';+import { LoginBrowserCloseError, type BrowserLoginSession } from '../../src/platform-connections/browser-login.js';const cookies = ['SID', 'SAPISID'].map(name => ({ name, value: `secret-${name}`, domain: '.youtube.com',path: '/', secure: true, httpOnly: true, expires: Date.now() / 1000 + 3600 }));@@ -20,16 +21,134 @@ afterEach(async () => {});const profile: BrowserProfile = { id: 'a'.repeat(24), browser: 'chrome', label: 'Chrome · Test', directory: '/test/profile', preferred: true };-async function setup(readBrowserCookies?: typeof readBrowserYouTubeCookies) {+async function setup(readBrowserCookies?: typeof readBrowserYouTubeCookies,+ options: Partial<ConstructorParameters<typeof YouTubeConnectionService>[0]> = {}) {const root = await mkdtemp(join(tmpdir(), 'youtube-connection-'));roots.push(root);- const service = new YouTubeConnectionService({ root, getRuntime: () => runtime, listProfiles: async () => [profile], readBrowserCookies });+ const service = new YouTubeConnectionService({ root, getRuntime: () => runtime, platform: 'darwin', listProfiles: async () => [profile], readBrowserCookies, ...options });services.push(service);await service.initialize();return { root, service };}const runtime: YtDlpRuntime = { executable: '/yt-dlp', prefixArgs: ['--js-runtimes', 'node:/node'], version: 'test', env: {} };+function loginSession() {+ let exit!: () => void;+ const session = { profile: { ...profile, directory: '/dedicated/Default' },+ exited: new Promise<void>(resolve => { exit = resolve; }), close: vi.fn(async () => {}), dispose: vi.fn(async () => {}) } satisfies BrowserLoginSession;+ return { session, exit, openLoginBrowser: vi.fn(async () => session) };+}++it('Windows 只打开专用登录窗口,等待完成后先关闭再读取,不扫描用户账号', async () => {+ const login = loginSession(); const order: string[] = [];+ login.session.close.mockImplementation(async () => { order.push('close'); });+ const read = vi.fn(async () => { order.push('read'); return cookies; });+ const listProfiles = vi.fn(async () => [profile]);+ const { service } = await setup(read, { platform: 'win32', openLoginBrowser: login.openLoginBrowser, listProfiles });+ expect(await service.getState()).toEqual({ platform: 'youtube', status: 'disconnected', connectionMethod: 'browser-login' });+ await service.connect();+ await vi.waitFor(async () => expect((await service.getState()).actionRequired).toBe('complete-login'));+ await service.connect();+ expect(login.openLoginBrowser).toHaveBeenCalledTimes(1);+ expect(read).not.toHaveBeenCalled(); expect(listProfiles).not.toHaveBeenCalled();+ await Promise.all([service.completeLogin(), service.completeLogin()]);+ await vi.waitFor(async () => expect((await service.getState()).status).toBe('connected'));+ expect(order).toEqual(['close', 'read']);+ expect(read).toHaveBeenCalledWith(expect.objectContaining({ profile: login.session.profile }));+ expect(login.session.dispose).toHaveBeenCalledTimes(1);+ expect(JSON.stringify(await service.getState())).not.toMatch(/secret|SID|dedicated/);+});++it('macOS 保持原账号一键读取,不打开或关闭专用窗口', async () => {+ const login = loginSession(); const read = vi.fn(async () => cookies);+ const { service } = await setup(read, { openLoginBrowser: login.openLoginBrowser });+ await service.connect(profile.id);+ await vi.waitFor(async () => expect((await service.getState()).status).toBe('connected'));+ expect(login.openLoginBrowser).not.toHaveBeenCalled();+ expect((await service.getState()).connectionMethod).toBeUndefined();+ expect(read).toHaveBeenCalledTimes(1);+});++it('Windows 专用窗口自行退出也会保存;关闭失败后等待手动完成,不循环关闭', async () => {+ const login = loginSession();+ login.session.close.mockRejectedValueOnce(new LoginBrowserCloseError());+ const read = vi.fn(async () => cookies);+ const { service } = await setup(read, { platform: 'win32', openLoginBrowser: login.openLoginBrowser });+ await service.connect();+ await vi.waitFor(async () => expect((await service.getState()).actionRequired).toBe('complete-login'));+ login.exit();+ await vi.waitFor(async () => expect((await service.getState()).actionRequired).toBe('close-login-browser'));+ expect(login.session.close).toHaveBeenCalledTimes(1);+ expect(read).not.toHaveBeenCalled();+ await service.completeLogin();+ await vi.waitFor(async () => expect((await service.getState()).status).toBe('connected'));+ expect(login.session.close).toHaveBeenCalledTimes(2);+ expect(read).toHaveBeenCalledTimes(1);+});++it.each(['cancel', 'timeout'] as const)('Windows 等待登录期间 %s 不保存凭据并清理专用窗口', async mode => {+ const login = loginSession(); const read = vi.fn(async () => cookies);+ const { root, service } = await setup(read, { platform: 'win32', openLoginBrowser: login.openLoginBrowser,+ connectionTimeoutMs: mode === 'timeout' ? 100 : undefined });+ await service.connect();+ await vi.waitFor(async () => expect((await service.getState()).actionRequired).toBe('complete-login'));+ if (mode === 'cancel') expect((await service.cancel()).status).toBe('disconnected');+ else await vi.waitFor(async () => expect(await service.getState()).toMatchObject({ status: 'error', message: '连接已取消或超时,请重新连接。' }));+ expect(read).not.toHaveBeenCalled();+ expect(login.session.close).toHaveBeenCalledTimes(1);+ expect(login.session.dispose).toHaveBeenCalledTimes(1);+ await expect(access(join(root, 'credentials.json'))).rejects.toThrow();+});++it('Windows 未登录不假成功,启动失败也不写入凭据', async () => {+ const login = loginSession();+ const { root, service } = await setup(async () => [], { platform: 'win32', openLoginBrowser: login.openLoginBrowser });+ await service.connect();+ await vi.waitFor(async () => expect((await service.getState()).actionRequired).toBe('complete-login'));+ await service.completeLogin();+ await vi.waitFor(async () => expect(await service.getState()).toMatchObject({ status: 'error', message: expect.stringContaining('尚未完成') }));+ await expect(access(join(root, 'credentials.json'))).rejects.toThrow();+ login.openLoginBrowser.mockRejectedValueOnce(new Error('无法打开 Chrome 登录窗口,请重试连接。'));+ await service.connect();+ await vi.waitFor(async () => expect((await service.getState()).message).toContain('无法打开'));+ await expect(access(join(root, 'credentials.json'))).rejects.toThrow();+});++it('Windows 重启和连接复用已保存凭据,明确过期后重新登录', async () => {+ const login = loginSession(); const read = vi.fn(async () => cookies);+ const { root, service } = await setup(read, { platform: 'win32', openLoginBrowser: login.openLoginBrowser });+ await service.importCookies(serializeYouTubeCookies(cookies));+ const restarted = new YouTubeConnectionService({ root, getRuntime: () => runtime, platform: 'win32',+ openLoginBrowser: login.openLoginBrowser, readBrowserCookies: read });+ services.push(restarted); await restarted.initialize();+ expect((await restarted.connect()).status).toBe('connected');+ expect(login.openLoginBrowser).not.toHaveBeenCalled();+ await expect(restarted.withCookies(async () => { throw new Error('cookies have expired'); })).rejects.toThrow();+ await restarted.connect();+ await vi.waitFor(async () => expect((await restarted.getState()).actionRequired).toBe('complete-login'));+ expect(login.openLoginBrowser).toHaveBeenCalledTimes(1);+ await restarted.completeLogin();+ await vi.waitFor(async () => expect((await restarted.getState()).status).toBe('connected'));+});++it('完成登录 API 需要 Runtime 授权,重复完成不会重复保存', async () => {+ const login = loginSession(); const read = vi.fn(async () => cookies);+ const { service } = await setup(read, { platform: 'win32', openLoginBrowser: login.openLoginBrowser });+ const server = Fastify(); server.addHook('onRequest', requireAuth('runtime-token'));+ await registerPlatformConnectionRoutes(server, service);+ const headers = { authorization: 'Bearer runtime-token' };+ const url = '/platform-connections/youtube/complete-login';+ try {+ expect((await server.inject({ method: 'POST', url })).statusCode).toBe(401);+ expect((await server.inject({ method: 'POST', url, headers })).json().status).toBe('disconnected');+ await service.connect();+ await vi.waitFor(async () => expect((await service.getState()).actionRequired).toBe('complete-login'));+ for (let i = 0; i < 2; i++) expect((await server.inject({ method: 'POST', url, headers })).statusCode).toBe(200);+ await vi.waitFor(async () => expect((await service.getState()).status).toBe('connected'));+ expect(read).toHaveBeenCalledTimes(1);+ } finally { await server.close(); }+});+it('exports only valid YouTube cookies including HttpOnly, and rejects malicious cookie fields', () => {const filtered = filterYouTubeCookies([...cookies,{ ...cookies[0], domain: '.google.com' }, { ...cookies[0], domain: '.youtube.com.evil.test' },@@ -144,7 +263,7 @@ it('reuses saved browser cookies for polling, concurrent tasks, nested requestsawait Promise.all(Array.from({ length: 5 }, () => useSavedCookies(service)));expect(read).toHaveBeenCalledTimes(1);- const restarted = new YouTubeConnectionService({ root, getRuntime: () => runtime,+ const restarted = new YouTubeConnectionService({ root, getRuntime: () => runtime, platform: 'darwin',listProfiles: async () => [profile], readBrowserCookies: read });services.push(restarted);await restarted.initialize();diff --git a/apps/desktop/e2e/desktop.spec.ts b/apps/desktop/e2e/desktop.spec.tsindex c2570d7e..5a5e75da 100644--- a/apps/desktop/e2e/desktop.spec.ts+++ b/apps/desktop/e2e/desktop.spec.ts@@ -1327,6 +1327,55 @@ test('@package-smoke 创作模块连接内嵌 Runtime 并使用默认项目', as}});+test('@package-smoke Windows YouTube 专用登录完成和取消,保存后重启复用', async ({}, testInfo) => {+ test.skip(process.platform !== 'win32', 'Windows normal Chrome login');+ let fixture = await launchPackagedDesktop('success');+ const endpoint = '/platform-connections/youtube';+ try {+ await waitForWorkspace(fixture.page);+ await navigateToAppRoute(fixture.page, '#/settings?tab=platform-connections');+ const section = fixture.page.getByRole('region', { name: '平台连接' });+ const state = await runtimeRequest<{ connectionMethod: string }>(fixture.page, 'GET', endpoint);+ expect(state.body.connectionMethod).toBe('browser-login');+ await expect(section.getByRole('combobox')).toHaveCount(0);+ await section.getByRole('button', { name: '连接', exact: true }).click();+ await expect(section.getByRole('button', { name: '完成登录', exact: true })).toBeVisible({ timeout: 30_000 });+ await expect(fixture.page.getByRole('alertdialog')).toHaveCount(0);+ await expect(section.getByLabel('连接码')).toHaveCount(0);+ await fixture.page.screenshot({ path: testInfo.outputPath('windows-youtube-login.png') });+ await section.getByRole('button', { name: '取消', exact: true }).click();+ await expect(section.locator('.platform-connection-status')).toHaveText('未连接');+ await section.getByRole('button', { name: '连接', exact: true }).click();+ await expect(section.getByRole('button', { name: '完成登录', exact: true })).toBeVisible({ timeout: 30_000 });+ await section.getByRole('button', { name: '完成登录', exact: true }).click();+ await expect(section.getByText('尚未完成 YouTube 登录', { exact: false })).toBeVisible({ timeout: 30_000 });+ await expect(section.locator('.platform-connection-status')).toHaveText('连接失败');+ // 使用纯测试凭据验证持久化和重启,真实账号登录由用户在正常 Chrome 中完成。+ const text = '# Netscape HTTP Cookie File\n' + ['SID', 'SAPISID'].map(name =>+ ['.youtube.com', 'TRUE', '/', 'TRUE', Math.floor(Date.now() / 1000) + 3600, name, 'fixture-' + name].join('\t')+ ).join('\n');+ expect((await runtimeRequest(fixture.page, 'POST', endpoint + '/import', { cookies: text })).status).toBe(200);+ await expect(section.locator('.platform-connection-status')).toHaveText('已连接');+ const previous = fixture;+ await closePackagedApp(previous);+ fixture = { ...await relaunchPackagedApp(previous), root: previous.root, stateDir: previous.stateDir };+ await waitForWorkspace(fixture.page);+ await navigateToAppRoute(fixture.page, '#/settings?tab=platform-connections');+ const restored = fixture.page.getByRole('region', { name: '平台连接' });+ await expect(restored.locator('.platform-connection-status')).toHaveText('已连接');+ await restored.getByRole('button', { name: '重新连接', exact: true }).click();+ await expect(restored.locator('.platform-connection-status')).toHaveText('已连接');+ await expect(restored.getByRole('button', { name: '完成登录' })).toHaveCount(0);+ expect(JSON.stringify((await runtimeRequest(fixture.page, 'GET', endpoint)).body)).not.toMatch(/fixture-|SID|cookies/);+ await fixture.page.screenshot({ path: testInfo.outputPath('windows-youtube-connected.png') });+ await restored.getByRole('button', { name: '断开', exact: true }).click();+ await expect(restored.locator('.platform-connection-status')).toHaveText('未连接');+ } finally {+ await runtimeRequest(fixture.page, 'POST', endpoint + '/cancel').catch(() => undefined);+ await closeFixture(fixture);+ }+});+test('@package-smoke YouTube 连接复用已登录 Chrome 并自动保存登录态', async ({}, testInfo) => {test.skip(process.platform !== 'darwin' || process.env.OPENCREATOR_E2E_REAL_YOUTUBE !== '1', 'Requires an existing signed-in local Chrome profile');let fixture = await launchPackagedDesktop('success');diff --git a/apps/web/e2e/web-desktop-parity.spec.ts b/apps/web/e2e/web-desktop-parity.spec.tsindex d14b5586..d7581e54 100644--- a/apps/web/e2e/web-desktop-parity.spec.ts+++ b/apps/web/e2e/web-desktop-parity.spec.ts@@ -1,6 +1,53 @@-import { createDefaultCreatorServicesConfig, type CreatorRuntimeComponentsResponse, type CreatorServicesCapabilitiesResponse, type CreatorYtDlpStatusResponse } from '@opencreator/protocol';+import { createDefaultCreatorServicesConfig, type CreatorRuntimeComponentsResponse, type CreatorServicesCapabilitiesResponse, type CreatorYtDlpStatusResponse, type YouTubeConnectionState } from '@opencreator/protocol';import { test, expect } from './fixtures/runtime.js';+test('Windows YouTube 专用登录和完成在 Browser/Desktop 下保持一致', async ({ browser, runtime }, testInfo) => {+ const results: unknown[] = [];+ const viewport = testInfo.project.name === 'chromium-mobile' ? { width: 390, height: 844 } : { width: 1280, height: 800 };+ for (const platform of ['browser', 'desktop']) {+ const context = await browser.newContext({ viewport, reducedMotion: 'reduce' });+ const page = await context.newPage();+ let state: YouTubeConnectionState = { platform: 'youtube', status: 'disconnected', connectionMethod: 'browser-login' };+ const payloads: Array<{ action: string | undefined; body: string | null }> = [];+ await page.route('**/platform-connections/youtube{,/**}', async route => {+ if (route.request().method() === 'POST') {+ const action = new URL(route.request().url()).pathname.split('/').at(-1);+ payloads.push({ action, body: route.request().postData() });+ state = action === 'connect' ? { ...state, status: 'connecting', actionRequired: 'complete-login',+ message: '请在打开的 Chrome 窗口中登录 YouTube' }+ : { ...state, status: action === 'cancel' ? 'disconnected' : 'connected', actionRequired: undefined, message: undefined };+ }+ await route.fulfill({ json: state });+ });+ if (platform === 'desktop') await installDesktopBridge(page);+ try {+ await runtime.openApp(page);+ await page.goto(`${runtime.origin}/#/settings?tab=platform-connections`);+ const section = page.getByRole('region', { name: '平台连接' });+ await expect(section.getByRole('button', { name: '连接', exact: true })).toBeVisible();+ await expect(section.getByRole('button', { name: '下载浏览器连接器' })).toHaveCount(0);+ await section.getByRole('button', { name: '连接', exact: true }).click();+ await expect(section.getByRole('button', { name: '完成登录', exact: true })).toBeVisible();+ await expect(page.getByRole('alertdialog')).toHaveCount(0);+ await section.getByRole('button', { name: '取消', exact: true }).click();+ await expect(section.locator('.platform-connection-status')).toHaveText('未连接');+ await section.getByRole('button', { name: '连接', exact: true }).click();+ await expect(section.getByRole('button', { name: '完成登录', exact: true })).toBeVisible();+ await expect(section.getByLabel('连接码', { exact: true })).toHaveCount(0);+ await expect(section.getByRole('combobox')).toHaveCount(0);+ expect(await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth)).toBe(true);+ const snapshot = { text: await section.innerText(), status: await section.locator('.platform-connection-status').boundingBox(),+ actions: await section.locator('.platform-connection-actions').boundingBox() };+ await page.screenshot({ path: testInfo.outputPath(`${platform}-youtube-login.png`) });+ await section.getByRole('button', { name: '完成登录', exact: true }).click();+ await expect(section.locator('.platform-connection-status')).toHaveText('已连接');+ expect(payloads.map(payload => payload.action)).toEqual(['connect', 'cancel', 'connect', 'complete-login']);+ results.push({ snapshot, payloads, state });+ } finally { await context.close(); }+ }+ expect(results[1]).toEqual(results[0]);+});+test('首页和项目页按需加载管理、登录与插件资源且 Browser/Desktop 布局一致', async ({ browser, runtime }, testInfo) => {test.skip(testInfo.project.name !== 'chromium-desktop');const results: unknown[] = [];diff --git a/apps/web/src/features/settings/PlatformConnectionsSettingsView.test.tsx b/apps/web/src/features/settings/PlatformConnectionsSettingsView.test.tsxindex 4d5fc45c..8c498af3 100644--- a/apps/web/src/features/settings/PlatformConnectionsSettingsView.test.tsx+++ b/apps/web/src/features/settings/PlatformConnectionsSettingsView.test.tsx@@ -4,11 +4,16 @@ import { expect, it, vi } from 'vitest';import type { YouTubeConnectionState } from '@opencreator/protocol';import { PlatformConnectionsSettingsView } from './PlatformConnectionsSettingsView.js';+const windowsState: YouTubeConnectionState = { platform: 'youtube', status: 'disconnected', connectionMethod: 'browser-login' };+const loginState: YouTubeConnectionState = { ...windowsState, status: 'connecting', actionRequired: 'complete-login',+ message: '请在打开的 Chrome 窗口中登录 YouTube' };+function api(initial: YouTubeConnectionState['status'] = 'disconnected') {let state: YouTubeConnectionState = { platform: 'youtube', status: initial };return {getYouTube: vi.fn(async () => state),- connectYouTube: vi.fn(async () => state = { platform: 'youtube', status: 'connecting' }),+ connectYouTube: vi.fn(async (): Promise<YouTubeConnectionState> => state = { platform: 'youtube', status: 'connecting' }),+ completeYouTubeLogin: vi.fn(async (): Promise<YouTubeConnectionState> => state = { ...windowsState, status: 'connected' }),cancelYouTube: vi.fn(async () => state = { platform: 'youtube', status: 'disconnected' }),disconnectYouTube: vi.fn(async () => state = { platform: 'youtube', status: 'disconnected' }),importYouTube: vi.fn(async () => state),@@ -38,3 +43,76 @@ it('cancels a login and disables actions when the runtime is disconnected', asynview.rerender(<PlatformConnectionsSettingsView connected={false} service={service} />);expect(screen.getByRole('button', { name: '连接' })).toBeDisabled();});++it('preserves browser profile selection and the original macOS connection interface', async () => {+ const service = api(); const user = userEvent.setup();+ service.getYouTube.mockResolvedValue({ platform: 'youtube', status: 'disconnected', profiles: [+ { id: 'a'.repeat(24), browser: 'chrome', label: 'Chrome · 原账号' },+ { id: 'b'.repeat(24), browser: 'edge', label: 'Edge · 第二账号' }+ ] });+ render(<PlatformConnectionsSettingsView connected service={service} />);+ await user.selectOptions(await screen.findByRole('combobox', { name: '浏览器账号' }), 'b'.repeat(24));+ await user.click(screen.getByRole('button', { name: '连接' }));+ expect(service.connectYouTube).toHaveBeenCalledWith('b'.repeat(24));+ expect(screen.queryByRole('button', { name: '下载浏览器连接器' })).not.toBeInTheDocument();+ expect(screen.queryByLabelText('连接码')).not.toBeInTheDocument();+});++it('Windows 一键打开专用登录,完成后连接,不显示连接码或关闭原浏览器确认', async () => {+ const service = api(); const user = userEvent.setup();+ service.getYouTube.mockResolvedValue(windowsState);+ service.connectYouTube.mockResolvedValue(loginState);+ render(<PlatformConnectionsSettingsView connected service={service} />);+ await screen.findByText('未连接');+ await user.click(screen.getByRole('button', { name: '连接' }));+ expect(service.connectYouTube).toHaveBeenCalledWith(undefined);+ expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument();+ expect(screen.queryByRole('combobox')).not.toBeInTheDocument();+ expect(screen.queryByLabelText('连接码')).not.toBeInTheDocument();+ expect(screen.getByRole('status')).toHaveTextContent(loginState.message!);+ await user.click(screen.getByRole('button', { name: '完成登录' }));+ expect(service.completeYouTubeLogin).toHaveBeenCalledTimes(1);+ expect(screen.getByRole('status')).toHaveTextContent('已连接');+});++it('专用窗口关闭失败后可再次完成登录,提示只关闭该窗口', async () => {+ const service = api(); const user = userEvent.setup();+ const failed: YouTubeConnectionState = { ...loginState, actionRequired: 'close-login-browser',+ message: '请关闭刚才打开的 YouTube 登录窗口,再点击“完成登录”。其他 Chrome 窗口可以保持打开。' };+ service.getYouTube.mockResolvedValue(failed);+ render(<PlatformConnectionsSettingsView connected service={service} />);+ await screen.findByText(failed.message!);+ await user.click(screen.getByRole('button', { name: '完成登录' }));+ expect(service.completeYouTubeLogin).toHaveBeenCalledTimes(1);+ expect(service.connectYouTube).not.toHaveBeenCalled();+});++it('专用登录可取消,Runtime 断开时完成登录和取消均禁用', async () => {+ const service = api(); const user = userEvent.setup();+ service.getYouTube.mockResolvedValue(loginState);+ const view = render(<PlatformConnectionsSettingsView connected service={service} />);+ await screen.findByRole('button', { name: '完成登录' });+ view.rerender(<PlatformConnectionsSettingsView connected={false} service={service} />);+ expect(screen.getByRole('button', { name: '完成登录' })).toBeDisabled();+ expect(screen.getByRole('button', { name: '取消' })).toBeDisabled();+ view.rerender(<PlatformConnectionsSettingsView connected service={service} />);+ await user.click(screen.getByRole('button', { name: '取消' }));+ expect(service.cancelYouTube).toHaveBeenCalledTimes(1);+ expect(service.completeYouTubeLogin).not.toHaveBeenCalled();+});++it('连接状态加载完成前禁用连接', () => {+ const service = api();+ service.getYouTube.mockImplementation(() => new Promise(() => {}));+ render(<PlatformConnectionsSettingsView connected service={service} />);+ expect(screen.getByRole('button', { name: '连接' })).toBeDisabled();+});++it('keeps file import available on Windows and disables actions when the Runtime disconnects', async () => {+ const service = api();+ service.getYouTube.mockResolvedValue(windowsState);+ const view = render(<PlatformConnectionsSettingsView connected service={service} />);+ expect(await screen.findByRole('button', { name: '导入 Cookie 文件' })).toBeEnabled();+ view.rerender(<PlatformConnectionsSettingsView connected={false} service={service} />);+ expect(screen.getByRole('button', { name: '连接' })).toBeDisabled();+});diff --git a/apps/web/src/features/settings/PlatformConnectionsSettingsView.tsx b/apps/web/src/features/settings/PlatformConnectionsSettingsView.tsxindex 14d70f51..dc184fff 100644--- a/apps/web/src/features/settings/PlatformConnectionsSettingsView.tsx+++ b/apps/web/src/features/settings/PlatformConnectionsSettingsView.tsx@@ -39,16 +39,23 @@ export function PlatformConnectionsSettingsView(props: { connected: boolean; ser}const service = props.service;- const disabled = !props.connected || !service || busy;+ const disabled = !props.connected || !service || !state || busy;const connecting = state?.status === 'connecting';const connected = state?.status === 'connected';- const profiles = state?.profiles ?? [];+ const managed = state?.connectionMethod === 'browser-login';+ const profiles = managed ? [] : state?.profiles ?? [];const profileId = profiles.some(profile => profile.id === selectedProfile) ? selectedProfile- : state?.profileId ?? profiles[0]?.id;- const label = connected ? l('已连接', 'Connected') : connecting ? l('正在读取浏览器登录态', 'Reading browser session')+ : profiles.find(profile => profile.id === state?.profileId)?.id ?? profiles[0]?.id;+ const awaitingLogin = connecting && !!state?.actionRequired;+ const label = connected ? l('已连接', 'Connected') : connecting ? state?.message ?? l('正在读取浏览器登录态', 'Reading browser session'): state?.status === 'expired' ? l('登录已过期', 'Session expired') : state?.status === 'error' ? l('连接失败', 'Connection failed'): l('未连接', 'Disconnected');+ async function connect() {+ if (!service || disabled) return;+ void act(() => service.connectYouTube(profileId));+ }+return <section className="settings-section" aria-labelledby="platform-connections-title"><header><h1 id="platform-connections-title">{l('平台连接', 'Platform connections')}</h1></header><div className="platform-connection-row">@@ -62,15 +69,17 @@ export function PlatformConnectionsSettingsView(props: { connected: boolean; seronChange={event => setSelectedProfile(event.target.value)}>{profiles.map(profile => <option key={profile.id} value={profile.id}>{profile.label}</option>)}</select> : null}+ {awaitingLogin ? <button type="button" disabled={disabled} onClick={() => service && void act(service.completeYouTubeLogin)}>+ <CheckCircle2 size={16} />{l('完成登录', 'Finish sign-in')}</button> : null}{connecting ? <button type="button" disabled={disabled} onClick={() => service && void act(service.cancelYouTube)}><X size={16} />{l('取消', 'Cancel')}</button>- : <button type="button" disabled={disabled} onClick={() => service && void act(() => service.connectYouTube(profileId))}>+ : <button type="button" disabled={disabled} onClick={() => void connect()}>{connected || state?.status === 'expired' ? <RefreshCw size={16} /> : <Link2 size={16} />}{connected || state?.status === 'expired' ? l('重新连接', 'Reconnect') : l('连接', 'Connect')}</button>}{connected || state?.status === 'expired' ? <button type="button" disabled={disabled} onClick={() => service && void act(service.disconnectYouTube)}><Unlink size={16} />{l('断开', 'Disconnect')}</button> : null}{!connecting ? <button type="button" disabled={disabled} aria-label={l('导入 Cookie 文件', 'Import cookie file')} title={l('导入 Cookie 文件', 'Import cookie file')} onClick={() => fileInput.current?.click()}><Upload size={16} /></button> : null}</div></div>- {state?.message ? <p role="status">{state.message}</p> : null}+ {state?.message && !connecting ? <p role="status">{state.message}</p> : null}{error ? <p role="alert">{error}</p> : null}<input ref={fileInput} type="file" accept=".txt" hidden onChange={event => {const file = event.currentTarget.files?.[0]; event.currentTarget.value = '';diff --git a/apps/web/src/features/settings/platform-connections.css b/apps/web/src/features/settings/platform-connections.cssindex bfdaaaa1..4a88bfc6 100644--- a/apps/web/src/features/settings/platform-connections.css+++ b/apps/web/src/features/settings/platform-connections.css@@ -3,6 +3,7 @@.platform-connection-identity h2 { font-size: 16px; margin: 0 0 6px; }.platform-connection-status { display: flex; align-items: center; gap: 6px; font-size: 13px; color: var(--muted); }.platform-connection-status.is-connected { color: var(--success); }+.platform-connection-status svg { flex-shrink: 0; }.platform-connection-actions { display: flex; flex-wrap: wrap; gap: 8px; }.platform-connection-actions select { min-width: 0; max-width: 220px; min-height: 34px; border: 1px solid var(--border); border-radius: 6px; padding: 6px 10px; color: var(--text); background: var(--surface); }.platform-connection-actions button { display: inline-flex; align-items: center; justify-content: center; gap: 6px; min-height: 34px; padding: 6px 10px; border: 1px solid var(--border); border-radius: 6px; background: transparent; color: inherit; cursor: pointer; }diff --git a/apps/web/src/services/platform-connections-service.ts b/apps/web/src/services/platform-connections-service.tsindex 39587ad6..7da66eb4 100644--- a/apps/web/src/services/platform-connections-service.ts+++ b/apps/web/src/services/platform-connections-service.ts@@ -5,7 +5,10 @@ export function createPlatformConnectionsService(client: Pick<RuntimeClient, 'geconst path = '/platform-connections/youtube';return {getYouTube(): Promise<YouTubeConnectionState> { return client.get(path); },- connectYouTube(profileId?: string): Promise<YouTubeConnectionState> { return client.post(`${path}/connect`, { profileId }); },+ connectYouTube(profileId?: string): Promise<YouTubeConnectionState> {+ return client.post(`${path}/connect`, { profileId });+ },+ completeYouTubeLogin(): Promise<YouTubeConnectionState> { return client.post(`${path}/complete-login`); },cancelYouTube(): Promise<YouTubeConnectionState> { return client.post(`${path}/cancel`); },disconnectYouTube(): Promise<YouTubeConnectionState> { return client.delete(path); },importYouTube(cookies: string): Promise<YouTubeConnectionState> { return client.post(`${path}/import`, { cookies }); }diff --git a/packages/protocol/src/platform-connections.ts b/packages/protocol/src/platform-connections.tsindex eab7e2ca..3da32442 100644--- a/packages/protocol/src/platform-connections.ts+++ b/packages/protocol/src/platform-connections.ts@@ -6,4 +6,6 @@ export type YouTubeConnectionState = {profileId?: string;profiles?: Array<{ id: string; browser: 'chrome' | 'edge'; label: string }>;message?: string;+ connectionMethod?: 'browser-login';+ actionRequired?: 'complete-login' | 'close-login-browser';};