@xcanwin/manyoyo 8.6.3 → 8.6.5

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/app-update.js

@@ -11,7 +11,7 @@ const { spawnSync } = require('child_process');
 const { downloadVerified, sha256File } = require('./download-verified');
 
 const REPO = 'xcanwin/manyoyo';
-const API_BASE = 'https://api.github.com';
+const WEB_BASE = 'https://github.com';
 // 不依赖 PATH 查找 tar（macOS 与常见 Linux 都在 /usr/bin）
 const TAR_COMMAND = fs.existsSync('/usr/bin/tar') ? '/usr/bin/tar' : 'tar';
 const VERSION_PATTERN = /^\d+\.\d+\.\d+$/;
@@ -103,35 +103,32 @@ async function request(fetchImpl, url, options = {}) {
 }
 
 /**
- * 查询最新 Release（匿名 API）。返回 { version, tag, assets: { name: url } }。
+ * 查询最新 Release。返回 { version, tag, assets: { name: url } }。
+ * 不调 GitHub API：匿名 API 按 IP 每小时 60 次，共享出口（公司网络、代理、CI runner）经常被限流。
+ * 改为跟随 github.com 的 releases/latest 跳转取版本（与 scripts/install.sh 一致），
+ * 升级包与 SHA256SUMS 的命名是固定的，下载地址直接拼在本仓库的 Release 下载路径下。
  */
-async function fetchLatestRelease({ fetchImpl = fetch, apiBase = API_BASE, now = Date.now } = {}) {
-    const response = await request(fetchImpl, `${apiBase}/repos/${REPO}/releases/latest`);
-    if (response.status === 403 || response.status === 429) {
-        const remaining = response.headers.get('x-ratelimit-remaining');
-        if (response.status === 429 || remaining === '0') {
-            const reset = Number(response.headers.get('x-ratelimit-reset'));
-            const when = reset > 0 ? new Date(reset * 1000).toLocaleTimeString('zh-CN', { hour12: false }) : '';
-            throw new UpdateError('RATE_LIMIT', `GitHub 对匿名请求做了频率限制，${when ? `请在 ${when} 之后重试` : '请稍后重试'}。`);
-        }
-    }
-    if (response.status === 404) throw new UpdateError('NO_RELEASE', '仓库还没有发布的 Release，暂时无法升级。');
-    if (!response.ok) throw new UpdateError('HTTP', `查询最新版本失败（HTTP ${response.status}）。`);
-    let release;
-    try {
-        release = await response.json();
-    } catch (error) {
-        throw new UpdateError('HTTP', '查询最新版本失败（返回内容不是有效的 JSON）。');
-    }
-    const version = String(release.tag_name || '').replace(/^v/, '');
-    if (!VERSION_PATTERN.test(version)) throw new UpdateError('HTTP', `最新 Release 的版本号无法识别: ${release.tag_name}`);
-    // 默认 API 下，下载地址必须在本仓库的 Release 下载路径内（测试注入自定义 apiBase 时不限制）
-    const allowedPrefix = apiBase === API_BASE ? `https://github.com/${REPO}/releases/download/` : '';
+async function fetchLatestRelease({ fetchImpl = fetch, webBase = WEB_BASE } = {}) {
+    const response = await request(fetchImpl, `${webBase}/${REPO}/releases/latest`, { redirect: 'manual', headers: { Accept: 'text/html' } });
+    if (response.status === 429) throw new UpdateError('RATE_LIMIT', 'GitHub 对访问做了频率限制，请稍后重试。');
+    const location = response.status >= 300 && response.status < 400 ? String(response.headers.get('location') || '') : '';
+    if (!location && !response.ok && response.status !== 404) throw new UpdateError('HTTP', `查询最新版本失败（HTTP ${response.status}）。`);
+    // 没有任何 Release 时 latest 跳到 Release 列表页（或 404）
+    const match = /\/releases\/tag\/([^/?#]+)$/.exec(location);
+    if (!match) throw new UpdateError('NO_RELEASE', '仓库还没有发布的 Release，暂时无法升级。');
+    const tag = decodeURIComponent(match[1]);
+    const version = tag.replace(/^v/, '');
+    if (!VERSION_PATTERN.test(version)) throw new UpdateError('HTTP', `最新 Release 的版本号无法识别: ${tag}`);
+    const download = `${webBase}/${REPO}/releases/download/${encodeURIComponent(tag)}/`;
     const assets = {};
-    for (const asset of Array.isArray(release.assets) ? release.assets : []) {
-        if (asset && typeof asset.name === 'string' && typeof asset.browser_download_url === 'string' && asset.browser_download_url.startsWith(allowedPrefix)) assets[asset.name] = asset.browser_download_url;
+    for (const targetOs of ['macos', 'linux']) {
+        for (const targetArch of ['arm64', 'x64']) {
+            const names = releaseAssetNames(version, targetArch, targetOs);
+            assets[names.app] = `${download}${names.app}`;
+            assets[names.sums] = `${download}${names.sums}`;
+        }
     }
-    return { version, tag: release.tag_name, assets };
+    return { version, tag, assets };
 }
 
 function parseSha256Sums(text) {
@@ -250,6 +247,11 @@ async function installAppUpdate({ appRoot, release, fetchImpl = fetch, targetArc
         throw new UpdateError('NO_ASSET', `Release ${release.version} 里没有适合这台机器（${targetOs}-${targetArch}）的升级包（需要 ${names.app} 与 ${names.sums}）。`);
     }
 
+    // 下载地址是按固定命名拼出来的：先确认这个 Release 里确实有本机的升级包（404 就是没有）
+    const probe = await request(fetchImpl, appUrl, { method: 'HEAD' });
+    if (probe.status === 404) {
+        throw new UpdateError('NO_ASSET', `Release ${release.version} 里没有适合这台机器（${targetOs}-${targetArch}）的升级包（需要 ${names.app} 与 ${names.sums}）。`);
+    }
     log(`校验清单: ${sumsUrl}`);
     const sums = parseSha256Sums(await fetchText(fetchImpl, sumsUrl));
     const expected = sums[names.app];

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();
         }