@ada-mcp/mcp-server 0.1.8 → 0.1.10

package/dist/cli.cjs

@@ -3568,6 +3568,39 @@ function resolveBundledPlaywrightCli() {
   const version = String(JSON.parse(raw).version ?? "");
   return { command: "node", cliArgs: [import_node_path5.default.join(root, "cli.js")], version };
 }
+function resolveChromiumBrowserVersion() {
+  try {
+    const browsersPath = require2.resolve("playwright-core/browsers.json");
+    const raw = (0, import_node_fs.readFileSync)(browsersPath, "utf8");
+    const parsed = JSON.parse(raw);
+    const chromium = parsed.browsers?.find((b) => b.name === "chromium");
+    return String(chromium?.browserVersion ?? "").trim();
+  } catch {
+    return "";
+  }
+}
+function playwrightChromiumZipUrl(host, browserVersion) {
+  const h = normalizeHostUrl(host);
+  const base = h.includes("cdn.npmmirror.com/binaries/playwright") || h.endsWith("/binaries/playwright") ? "https://cdn.npmmirror.com/binaries/playwright" : h.includes("npmmirror.com") && !h.includes("/mirrors/playwright") ? "https://npmmirror.com/mirrors/playwright" : h;
+  return `${base}/builds/cft/${browserVersion}/win64/chrome-win64.zip`;
+}
+async function probePlaywrightBrowserArtifact(host, browserVersion) {
+  const url = playwrightChromiumZipUrl(host, browserVersion);
+  const started = Date.now();
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 8e3);
+  try {
+    const response = await fetch(url, { method: "HEAD", redirect: "follow", signal: controller.signal });
+    if (response.status === 200) {
+      return Date.now() - started;
+    }
+    return null;
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
 function requiredAppiumDrivers(config) {
   return Array.from(new Set(config.appium.requiredDrivers ?? []));
 }
@@ -3677,7 +3710,6 @@ async function resolveCompatibleDriverSpecs(driver) {
   return Array.from(new Set(specs));
 }
 var detectedBestRegistryByKey = /* @__PURE__ */ new Map();
-var detectedBestPlaywrightHost = null;
 var PROGRESS_STEPS = [
   "deps.ensure.start",
   "registry.probe.start",
@@ -3859,40 +3891,43 @@ async function probePlaywrightHostLatency(host) {
   }
   return best;
 }
-async function detectBestPlaywrightHost(config) {
-  if (detectedBestPlaywrightHost) {
-    return detectedBestPlaywrightHost;
-  }
+async function rankPlaywrightHosts(config) {
   const candidates = playwrightHostCandidates(config);
-  progress("playwright.host.probe.start", { candidates });
+  const browserVersion = resolveChromiumBrowserVersion();
+  progress("playwright.host.probe.start", { candidates, browserVersion: browserVersion || void 0 });
   const probeResults = await Promise.all(candidates.map(async (candidate) => {
     progress("playwright.host.probe.try", { candidate });
-    const latency = await probePlaywrightHostLatency(candidate);
-    progress("playwright.host.probe.result", { candidate, latencyMs: latency });
-    return { candidate, latency };
+    const artifactLatency = browserVersion ? await probePlaywrightBrowserArtifact(candidate, browserVersion) : null;
+    const rootLatency = await probePlaywrightHostLatency(candidate);
+    const latency = artifactLatency ?? rootLatency;
+    const artifactOk = artifactLatency !== null;
+    progress("playwright.host.probe.result", {
+      candidate,
+      latencyMs: latency,
+      artifactOk,
+      browserVersion: browserVersion || void 0
+    });
+    return { candidate, latency, artifactOk, priority: playwrightHostPriorityIndex(candidates, candidate) };
   }));
-  let best = candidates[0] ?? PLAYWRIGHT_HOST_FALLBACK;
-  let bestLatency = Number.POSITIVE_INFINITY;
-  let bestPriority = Number.POSITIVE_INFINITY;
-  for (const { candidate, latency } of probeResults) {
-    if (latency === null)
-      continue;
-    const priority = playwrightHostPriorityIndex(candidates, candidate);
-    if (latency < bestLatency || latency === bestLatency && priority < bestPriority) {
-      best = candidate;
-      bestLatency = latency;
-      bestPriority = priority;
+  const reachable = probeResults.filter((x) => x.latency !== null);
+  const withArtifact = reachable.filter((x) => x.artifactOk);
+  const pool = withArtifact.length > 0 ? withArtifact : reachable;
+  pool.sort((a, b) => {
+    if (a.artifactOk !== b.artifactOk) {
+      return a.artifactOk ? -1 : 1;
     }
-  }
-  detectedBestPlaywrightHost = best;
-  log("info", {
-    event: "deps.playwright.host.auto-selected",
-    details: {
-      selected: best,
-      candidates
+    if (a.latency !== b.latency) {
+      return (a.latency ?? 0) - (b.latency ?? 0);
     }
+    return a.priority - b.priority;
   });
-  return best;
+  const ranked = pool.map((x) => x.candidate);
+  for (const candidate of candidates) {
+    if (!ranked.includes(candidate)) {
+      ranked.push(candidate);
+    }
+  }
+  return ranked.length > 0 ? ranked : [...candidates];
 }
 async function runInstallWithPriority(config, packages, onLogLine) {
   const npmProxy = await detectBestRegistry(config, npmProxyRegistry());
@@ -4035,16 +4070,37 @@ async function installPlaywrightBrowser(config, onLogLine, options) {
   if (targets.length > 0) {
     installArgs.push(...targets);
   }
-  const selectedHost = await detectBestPlaywrightHost(config);
-  onLogLine?.(`[playwright] \u4F7F\u7528\u5185\u7F6E playwright@${version} CLI\uFF0C\u955C\u50CF ${selectedHost}\uFF0C\u76EE\u6807: ${targets.length ? targets.join(",") : "all"}${options?.force ? " (--force)" : ""}`);
+  const rankedHosts = await rankPlaywrightHosts(config);
   const timeoutMs = playwrightInstallTimeoutMs();
   onLogLine?.(`[playwright] \u5B89\u88C5\u8D85\u65F6\u4E0A\u9650 ${Math.round(timeoutMs / 1e3)}s\uFF08\u53EF\u7528 ADA_PLAYWRIGHT_INSTALL_TIMEOUT_MS \u8C03\u6574\uFF09`);
-  await runCommand2(command, installArgs, {
-    env: { PLAYWRIGHT_DOWNLOAD_HOST: selectedHost },
-    timeoutMs,
-    onLogLine
-  });
-  progress("playwright.browser.install.done", { selectedHost });
+  let lastError;
+  for (let i = 0; i < rankedHosts.length; i++) {
+    const host = rankedHosts[i];
+    if (i > 0) {
+      onLogLine?.(`[playwright] \u4E0A\u4E00\u955C\u50CF\u5931\u8D25\uFF0C\u6539\u8BD5 ${host}`);
+    }
+    onLogLine?.(`[playwright] \u4F7F\u7528\u5185\u7F6E playwright@${version} CLI\uFF0C\u955C\u50CF ${host}\uFF0C\u76EE\u6807: ${targets.length ? targets.join(",") : "all"}${options?.force ? " (--force)" : ""}`);
+    try {
+      await runCommand2(command, installArgs, {
+        env: { PLAYWRIGHT_DOWNLOAD_HOST: host },
+        timeoutMs,
+        onLogLine
+      });
+      progress("playwright.browser.install.done", { selectedHost: host, attempt: i + 1 });
+      return;
+    } catch (error) {
+      lastError = error;
+      log("warn", {
+        event: "deps.playwright.browser.install.host.fail",
+        details: {
+          host,
+          attempt: i + 1,
+          message: error instanceof Error ? error.message : String(error)
+        }
+      });
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error(String(lastError ?? "playwright browser install failed"));
 }
 async function checkPlaywrightLaunchable() {
   try {
@@ -6624,6 +6680,13 @@ function resolveBootstrapInstallDeps(argv2) {
   if (nativeDir) extras.nativeDriversDir = nativeDir;
   return { skip: false, scopes, force, extras };
 }
+var PREINSTALL_PLAYWRIGHT_HOST_ALLOW = /* @__PURE__ */ new Set([
+  "https://cdn.playwright.dev",
+  "https://playwright.azureedge.net"
+]);
+function normalizePlaywrightHost(url) {
+  return url.replace(/\/$/, "");
+}
 function applyPreinstallPlaywrightHostFile() {
   if (process.env.PLAYWRIGHT_DOWNLOAD_HOST?.trim()) {
     return;
@@ -6634,12 +6697,18 @@ function applyPreinstallPlaywrightHostFile() {
   for (const root of roots) {
     const file = import_node_path10.default.join(root, ".ada-mcp-playwright-host");
     try {
-      const host = import_node_fs3.default.readFileSync(file, "utf8").trim();
-      if (host.length > 0) {
+      const host = normalizePlaywrightHost(import_node_fs3.default.readFileSync(file, "utf8").trim());
+      if (host.length > 0 && PREINSTALL_PLAYWRIGHT_HOST_ALLOW.has(host)) {
         process.env.PLAYWRIGHT_DOWNLOAD_HOST = host;
         console.error(`[ADA-MCP] using playwright CDN from ${file}: ${host}`);
         return;
       }
+      if (host.length > 0) {
+        console.error(
+          `[ADA-MCP] ignore preinstall playwright CDN (runtime will re-probe): ${host}`
+        );
+        return;
+      }
     } catch {
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-mcp/mcp-server",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "ADA MCP server for web/mobile automation (stdio + remote HTTP)",
   "private": false,
   "type": "commonjs",
@@ -35,7 +35,7 @@
     "express": "^5.2.1",
     "jimp": "^1.6.0",
     "js-yaml": "^4.1.0",
-    "playwright": "^1.59.1",
+    "playwright": "1.59.1",
     "selenium-webdriver": "^4.34.0"
   },
   "devDependencies": {

package/scripts/preinstall-probes.mjs

@@ -62,7 +62,11 @@ async function main() {
     console.error(`[ada-mcp preinstall]   registry ${candidate} -> ${latency === null ? "fail" : `${latency}ms`}`);
   }
 
-  const pwCandidates = playwrightHostCandidateList();
+  /** preinstall 阶段依赖尚未安装，无法校验浏览器包是否存在；仅测官方 CDN，避免写入国内镜像后 404 */
+  const pwCandidates = [
+    "https://cdn.playwright.dev",
+    "https://playwright.azureedge.net"
+  ];
   const pw = await detectBestPlaywrightHost(pwCandidates);
   const hostFile = path.join(root, ".ada-mcp-playwright-host");
   fs.writeFileSync(hostFile, `${pw.best}\n`, "utf8");