@xcanwin/manyoyo 8.6.4 → 8.6.6

package/bin/manyoyo.js

@@ -1395,6 +1395,7 @@ https://github.com/xcanwin/manyoyo
     [
         ['down', '停止当前模式，回到默认模式'],
         ['status', '查看当前模式并真实探测浏览器是否可用（不可用时退出码非 0）'],
+        ['probe', '真实探测当前模式（不切换模式、失败也不回退；默认模式会起一次性容器；失败退出码非 0）'],
         ['logs', '查看当前模式的浏览器服务日志'],
         ['mcp-add', '输出在容器内注册 Playwright MCP（stdio，随当前模式自动切换）的命令']
     ].forEach(([action, description]) => {

package/lib/download-verified.js

@@ -16,11 +16,16 @@ function sha256File(filePath) {
     });
 }
 
+const RETRYABLE_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+class RetryableError extends Error {}
+
 /**
  * 下载并校验 SHA256。缓存命中（文件存在且哈希一致）直接复用；
  * 哈希不符一律删除并报错，绝不保留不可信文件。
+ * 5xx / 429 / 网络错误（含下载中途断开）按 1s、2s、4s 退避，最多重试 retries 次；4xx 与哈希不符不重试。
  */
-async function downloadVerified({ url, sha256, dest, fetchImpl = fetch, log = () => {} }) {
+async function downloadVerified({ url, sha256, dest, fetchImpl = fetch, log = () => {}, retries = 3, retryDelayMs = 1000 }) {
     if (!/^[0-9a-f]{64}$/.test(sha256 || '')) {
         throw new Error(`缺少有效的 SHA256: ${url}`);
     }
@@ -29,13 +34,20 @@ async function downloadVerified({ url, sha256, dest, fetchImpl = fetch, log = ()
         log(`缓存命中: ${path.basename(dest)}`);
         return dest;
     }
-    log(`下载: ${url}`);
-    const response = await fetchImpl(url, { redirect: 'follow' });
-    if (!response.ok || !response.body) {
-        throw new Error(`下载失败 (${response.status}): ${url}`);
-    }
     const partial = `${dest}.partial`;
-    await pipeline(Readable.fromWeb(response.body), fs.createWriteStream(partial));
+    for (let attempt = 0; ; attempt += 1) {
+        try {
+            await fetchOnce({ url, partial, fetchImpl, log });
+            break;
+        } catch (error) {
+            fs.rmSync(partial, { force: true });
+            const retryable = error instanceof RetryableError || !(error && error.status);
+            if (!retryable || attempt >= retries) throw error instanceof RetryableError ? error.cause : error;
+            const wait = retryDelayMs * (2 ** attempt);
+            log(`下载失败，${wait / 1000} 秒后重试（${attempt + 1}/${retries}）: ${error.message}`);
+            await new Promise(resolve => setTimeout(resolve, wait));
+        }
+    }
     const actual = await sha256File(partial);
     if (actual !== sha256) {
         fs.rmSync(partial, { force: true });
@@ -45,4 +57,15 @@ async function downloadVerified({ url, sha256, dest, fetchImpl = fetch, log = ()
     return dest;
 }
 
+async function fetchOnce({ url, partial, fetchImpl, log }) {
+    log(`下载: ${url}`);
+    const response = await fetchImpl(url, { redirect: 'follow' });
+    if (!response.ok || !response.body) {
+        const error = Object.assign(new Error(`下载失败 (${response.status}): ${url}`), { status: response.status });
+        if (RETRYABLE_STATUS.has(response.status)) throw Object.assign(new RetryableError(error.message), { cause: error });
+        throw error;
+    }
+    await pipeline(Readable.fromWeb(response.body), fs.createWriteStream(partial));
+}
+
 module.exports = { sha256File, downloadVerified };

package/lib/plugin/playwright.js

@@ -35,6 +35,15 @@ const SERVER_START_TIMEOUT_MS = 30000;
 const PROBE_TIMEOUT_MS = 5000;
 // chrome 首次连接要等用户在 Chrome 弹出的“要允许远程调试吗？”里点允许
 const CHROME_APPROVAL_TIMEOUT_MS = 60000;
+// 默认模式的探测：一次性容器里用 playwright-cli 打开 data: 页面，再读回标题（读到 manyoyo-ok 才算通过）
+const CONTAINER_PROBE_TIMEOUT_MS = 180000;
+const CONTAINER_PROBE_SCRIPT = [
+    'playwright-cli -s=manyoyo-probe open "data:text/html,<title>manyoyo-ok</title>" >/dev/null 2>&1',
+    'out=$(playwright-cli -s=manyoyo-probe eval document.title 2>&1)',
+    'playwright-cli -s=manyoyo-probe close >/dev/null 2>&1',
+    'echo "$out"',
+    'case "$out" in *manyoyo-ok*) exit 0;; *) exit 1;; esac'
+].join('; ');
 
 function asObject(value) {
     return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
@@ -399,10 +408,11 @@ class PlaywrightPlugin {
         return this.runtime;
     }
 
-    runtimeCall(args, { capture = true } = {}) {
+    runtimeCall(args, { capture = true, timeout } = {}) {
         const runtime = this.resolveRuntime();
         const result = spawnSync(runtime.command, args, {
             encoding: 'utf8',
+            ...(timeout ? { timeout } : {}),
             env: { ...process.env, ...runtime.env },
             stdio: capture ? ['ignore', 'pipe', 'pipe'] : 'inherit'
         });
@@ -899,6 +909,46 @@ class PlaywrightPlugin {
         return 1;
     }
 
+    // 真实探测当前模式（不切换模式、失败也不回退；发布流水线用它：status 在失败时会把模式回退成默认；默认模式会按需重建 current/ 里的配置文件）。
+    // 宿主机上的模式连上浏览器服务开页面；默认模式（容器内浏览器）起一个一次性容器，真的打开页面并读回标题
+    async probe() {
+        const state = this.readState();
+        if (state.mode !== 'default') {
+            const alive = await this.modeAlive(state);
+            const result = alive ? await this.probeState(state) : { ok: false, error: state.mode === 'vnc' ? 'vnc 容器没有在运行' : '浏览器服务进程已不在' };
+            if (result.ok) {
+                this.out(`真实探测: 通过（${state.mode}，${result.ms}ms）`);
+                return 0;
+            }
+            this.err(`真实探测: 失败（${state.mode}：${result.error}）`);
+            return 1;
+        }
+        let image;
+        try {
+            image = this.ensureBaseImage();
+        } catch (error) {
+            this.err(`真实探测: 失败（${error.message}）`);
+            return 1;
+        }
+        const runtimeCommand = this.runtimeCommand();
+        const integration = await this.buildContainerIntegration({ runtimeCommand });
+        const name = `manyoyo-probe-${process.pid}`;
+        const args = ['run', '--rm', '--init', '--name', name, '--shm-size=1g', ...integration.extraArgs];
+        for (const volume of integration.volumes) args.push('--volume', volume);
+        for (const entry of integration.env) args.push('--env', entry);
+        args.push(image, 'sh', '-c', CONTAINER_PROBE_SCRIPT);
+        const started = Date.now();
+        const result = this.runtimeCall(args, { timeout: CONTAINER_PROBE_TIMEOUT_MS });
+        if (result.status !== 0) this.runtimeCall(['rm', '-f', name]); // 超时时容器客户端被杀，容器本身可能还在
+        if (result.status === 0 && /manyoyo-ok/.test(result.stdout)) {
+            this.out(`真实探测: 通过（default，${Date.now() - started}ms）`);
+            return 0;
+        }
+        const reason = `${result.stdout}${result.stderr}`.trim().split('\n').filter(Boolean).slice(-1)[0] || `退出码 ${result.status}`;
+        this.err(`真实探测: 失败（default：容器里没能打开页面，${reason}）`);
+        return 1;
+    }
+
     logs() {
         const state = this.readState();
         if (state.mode === 'vnc') {
@@ -933,6 +983,9 @@ class PlaywrightPlugin {
         if (action === 'status') {
             return await this.status();
         }
+        if (action === 'probe') {
+            return await this.probe();
+        }
         if (action === 'logs') {
             return this.logs();
         }