@xcanwin/manyoyo 8.3.1 → 8.3.3

package/lib/plugin/playwright.js

@@ -33,6 +33,8 @@ const DEFAULT_PORTS = { port: 8935, vncPort: 5900, novncPort: 6080 };
 const PROXY_BYPASS_HOSTS = ['host.docker.internal', 'host.containers.internal'];
 const SERVER_START_TIMEOUT_MS = 30000;
 const PROBE_TIMEOUT_MS = 5000;
+// chrome 首次连接要等用户在 Chrome 弹出的“要允许远程调试吗？”里点允许
+const CHROME_APPROVAL_TIMEOUT_MS = 60000;
 
 function asObject(value) {
     return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
@@ -104,6 +106,12 @@ function defaultListenHost(platform = process.platform) {
     return platform === 'darwin' ? '127.0.0.1' : '0.0.0.0';
 }
 
+// headed 的浏览器服务必须监听 0.0.0.0：playwright 只绑 loopback 时会按 Host 头做 DNS 重绑定防护，
+// 容器用 host.containers.internal 访问会被 403（macOS 上实测）；监听 0.0.0.0 则不检查 Host，靠 token 保护
+function headedListenHost() {
+    return '0.0.0.0';
+}
+
 function runtimeKind(runtimeCommand) {
     return path.basename(String(runtimeCommand || '').trim()).toLowerCase() === 'podman' ? 'podman' : 'docker';
 }
@@ -410,17 +418,17 @@ class PlaywrightPlugin {
 
     // ---------- 探测 ----------
 
-    probe(kind, endpoint) {
+    probe(kind, endpoint, timeout = PROBE_TIMEOUT_MS) {
         return new Promise(resolve => {
             const child = spawn(process.execPath, [path.join(__dirname, 'playwright-probe.js')], {
                 env: {
                     ...process.env,
-                    MANYOYO_PROBE: JSON.stringify({ core: this.corePath(), kind, endpoint, timeout: PROBE_TIMEOUT_MS })
+                    MANYOYO_PROBE: JSON.stringify({ core: this.corePath(), kind, endpoint, timeout })
                 },
                 stdio: ['ignore', 'pipe', 'ignore']
             });
             let output = '';
-            const timer = setTimeout(() => child.kill('SIGKILL'), PROBE_TIMEOUT_MS + 3000);
+            const timer = setTimeout(() => child.kill('SIGKILL'), timeout + 3000);
             child.stdout.on('data', chunk => { output += chunk; });
             child.on('error', () => {
                 clearTimeout(timer);
@@ -439,7 +447,9 @@ class PlaywrightPlugin {
 
     async probeState(state) {
         const endpoint = `ws://127.0.0.1:${state.port}/${this.ensureToken()}`;
-        return await this.probe(state.mode === 'chrome' ? 'cdp' : 'ws', endpoint);
+        return state.mode === 'chrome'
+            ? await this.probe('cdp', endpoint, CHROME_APPROVAL_TIMEOUT_MS)
+            : await this.probe('ws', endpoint);
     }
 
     // ---------- 进程管理 ----------
@@ -539,7 +549,7 @@ class PlaywrightPlugin {
         let child = null;
         for (const chromiumSandbox of [true, false]) {
             writeConfigFileSecure(serverConfigPath, `${JSON.stringify(fingerprint.buildServerConfig({
-                host: defaultListenHost(),
+                host: headedListenHost(),
                 port,
                 wsPath: `/${token}`,
                 chromiumSandbox,
@@ -559,20 +569,26 @@ class PlaywrightPlugin {
             }
             this.out('[up] 系统不允许非特权用户命名空间，Chromium 沙箱不可用，改为无沙箱启动。');
         }
-        return { mode: 'headed', port, pid: child.pid, listenHost: defaultListenHost(), extensionPaths };
+        return { mode: 'headed', port, pid: child.pid, listenHost: headedListenHost(), extensionPaths };
     }
 
     async startChrome() {
         const { port } = this.config;
         const candidates = this.devtoolsCandidates();
-        if (!findDevToolsActivePort(candidates)) {
-            return this.startFailure('chrome', '没有找到正在运行且开启了远程调试的 Chrome。',
-                '在 Chrome 地址栏打开 chrome://inspect/#remote-debugging 并开启后重试；\n'
-                + '自定义用户目录时，在 plugins.playwright.devtoolsActivePortPath 指定 DevToolsActivePort 文件。');
+        const enableHint = '请在 Chrome 地址栏进入 chrome://inspect/#remote-debugging，勾选“Allow remote debugging”（Chrome 没开就先打开它），然后重试。\n'
+            + '（自定义用户目录时，用 plugins.playwright.devtoolsActivePortPath 指定 DevToolsActivePort 文件。）';
+        const target = findDevToolsActivePort(candidates);
+        if (!target) {
+            return this.startFailure('chrome', '没有找到开启了远程调试的 Chrome。', enableHint);
+        }
+        // Chrome 退出后会留下旧的 DevToolsActivePort，所以还要确认调试端口真的在监听
+        if (!(await portReady(target.port))) {
+            return this.startFailure('chrome', 'Chrome 没有在运行（只找到上次留下的调试端口记录）。', enableHint);
         }
         if (!(await this.portPreflight('chrome', port))) {
             return 1;
         }
+        fs.rmSync(this.logPath(), { force: true });
         const relayConfigPath = path.join(this.runDir, 'relay.json');
         writeConfigFileSecure(relayConfigPath, `${JSON.stringify({
             host: defaultListenHost(), port, token: this.ensureToken(), candidates
@@ -724,9 +740,9 @@ class PlaywrightPlugin {
             this.out(`原生 VNC: 127.0.0.1:${state.vncPort}（密码见 manyoyo playwright status）`);
         }
         if (state.mode === 'chrome') {
-            this.out('⚠️  风险: 容器内 Agent 能操作你 Chrome 里已登录的所有网站。Chrome 可能弹出“允许远程调试”确认框，请点允许。');
+            this.out('⚠️  风险: 容器内 Agent 能操作你 Chrome 里已登录的所有网站。Chrome 每次新连接（每次 playwright-cli open、每次 status）都会弹出“要允许远程调试吗？”，请点“允许”。');
         }
-        if (process.platform !== 'darwin' && state.mode !== 'default') {
+        if (state.mode !== 'default' && !(process.platform === 'darwin' && state.mode !== 'headed')) {
             this.out(`安全: 端口 ${state.port} 监听 0.0.0.0，仅靠 token 保护；建议用防火墙限制来源。`);
         }
     }
@@ -760,15 +776,23 @@ class PlaywrightPlugin {
         this.writeState(state);
         this.writeCurrentConfig(state, this.runtimeCommand());
 
+        if (mode === 'chrome') {
+            this.out('等待 Chrome 确认：请在 Chrome 弹出的“要允许远程调试吗？”里点“允许”（最多等 60 秒）…');
+        }
         const result = await this.probeState(state);
         if (!result.ok) {
-            this.err(`[up] ${mode} 已启动，但真实探测失败: ${result.error}`);
-            this.err(tailText(this.logPath(), 10));
+            if (mode === 'chrome') {
+                this.err('[up] chrome 失败: 连不上 Chrome 的调试接口。');
+                this.err('请确认已在 chrome://inspect/#remote-debugging 开启远程调试，并在 Chrome 弹出的“要允许远程调试吗？”里点“允许”（60 秒内），然后重试。');
+            } else {
+                this.err(`[up] ${mode} 失败: 浏览器服务已启动，但打不开页面（${result.error}）。`);
+                this.err(tailText(this.logPath(), 10));
+            }
             // 回滚：不让坏掉的模式留在配置里
             await this.stopCurrent(state);
             this.writeState({ mode: 'default' });
             this.writeCurrentConfig({ mode: 'default' }, this.runtimeCommand());
-            this.err('已回滚到默认模式。');
+            this.err('已回到默认模式。');
             return 1;
         }
         this.out(`✅ ${mode} 模式已就绪（真实探测通过，${result.ms}ms）`);
@@ -892,5 +916,6 @@ module.exports = {
     PlaywrightPlugin,
     appendNoProxy,
     connectHostFor,
-    defaultListenHost
+    defaultListenHost,
+    headedListenHost
 };